Skip to content

Add an additional check to prevent NRE #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Happypig375 merged 3 commits into from
Nov 23, 2019
Merged

Add an additional check to prevent NRE #100

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ffd617
add an additional check to prevent NRE
FoggyFinder Nov 23, 2019
65cb335
tidy
FoggyFinder Nov 23, 2019
37690b7
even more
FoggyFinder Nov 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions CSharpMath.Editor/Keyboards/MathKeyboard.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,25 +103,14 @@ void HandleScriptButton(bool isSuperScript) {
SetScript(emptyAtom, MathAtoms.PlaceholderList);
MathList.InsertAndAdvance(ref _insertionIndex, emptyAtom, subIndexType);
} else {
var prevAtom = MathList.AtomAt(_insertionIndex.Previous);
#warning Simplify to tuple patterns when C# 8 is out
switch ((GetScript(prevAtom) is null, _insertionIndex.FinalSubIndexType is MathListSubIndexType.BetweenBaseAndScripts)) {
case var t when t == (true, true):
SetScript(MathList.AtomAt(_insertionIndex.LevelDown()), MathAtoms.PlaceholderList);
_insertionIndex = _insertionIndex.LevelDown().LevelUpWithSubIndex(subIndexType, MathListIndex.Level0Index(0));
break;
case var t when t == (true, false):
SetScript(prevAtom, MathAtoms.PlaceholderList);
_insertionIndex = _insertionIndex.Previous.LevelUpWithSubIndex(subIndexType, MathListIndex.Level0Index(0));
break;
case var t when t == (false, true):
// If we are already inside the nucleus, then we come out and go up to the script
_insertionIndex = _insertionIndex.LevelDown().LevelUpWithSubIndex(subIndexType, MathListIndex.Level0Index(GetScript(prevAtom).Atoms.Count));
break;
case var t when t == (false, false):
_insertionIndex = _insertionIndex.Previous.LevelUpWithSubIndex(subIndexType, MathListIndex.Level0Index(GetScript(prevAtom).Atoms.Count));
break;
var isBetweenBaseAndScripts = _insertionIndex.FinalSubIndexType is MathListSubIndexType.BetweenBaseAndScripts;
var prevIndexCorrected = isBetweenBaseAndScripts ? _insertionIndex.LevelDown() : _insertionIndex.Previous;
var prevAtom = MathList.AtomAt(prevIndexCorrected);
var script = GetScript(prevAtom);
if (script is null) {
SetScript(prevAtom, MathAtoms.PlaceholderList);
}
_insertionIndex = prevIndexCorrected.LevelUpWithSubIndex(subIndexType, MathListIndex.Level0Index(script?.Atoms?.Count ?? 0));
}
}

Expand Down