Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit 5416307

Browse files
committed
progress in fixing closing bracket automatic placement
1 parent 2609251 commit 5416307

File tree

3 files changed

+25
-27
lines changed

3 files changed

+25
-27
lines changed

Interop/Updater/UpdateCheck.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ private static bool IsUpToDate(Version currentVer, Version latestVer)
8282
/// <returns></returns>
8383
private static async Task<List<Release>> GetAllReleases()
8484
{
85-
var client = new GitHubClient(new ProductHeaderValue("spcode-client"));
86-
var allReleases = await client.Repository.Release.GetAll("SPCodeOrg", "SPCode");
87-
var list = new List<Release>();
88-
for (int i = 0; i <= 10; i++)
85+
var apiOptions = new ApiOptions()
8986
{
90-
list.Add(allReleases[i]);
91-
}
92-
return list;
87+
PageCount = 1,
88+
PageSize = 10
89+
};
90+
91+
var client = new GitHubClient(new ProductHeaderValue("spcode-client"));
92+
return (await client.Repository.Release.GetAll("SPCodeOrg", "SPCode", apiOptions)).ToList();
9393
}
9494
}
9595
}

UI/Components/EditorElement/EditorElement.xaml.cs

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -495,13 +495,22 @@ private void TextArea_TextEntering(object sender, TextCompositionEventArgs e)
495495
case ")":
496496
case "]":
497497
case "}":
498-
if (Program.OptionsObject.Editor_AutoCloseBrackets &&
499-
BracketHelpers.CheckForClosingBracket(editor.Document, editor.TextArea.Caret.Offset, e.Text))
498+
if (Program.OptionsObject.Editor_AutoCloseBrackets)
500499
{
501-
e.Handled = true;
502-
var newCaretPos = editor.TextArea.Caret.Offset + 1;
503-
var docLength = editor.Document.TextLength;
504-
editor.TextArea.Caret.Offset = newCaretPos > docLength ? docLength : newCaretPos;
500+
if (editor.TextArea.Caret.Offset + 1 < editor.Document.TextLength)
501+
{
502+
if (BracketHelpers.CheckForClosingBracket(editor.Document, editor.TextArea.Caret.Offset, e.Text))
503+
{
504+
e.Handled = true;
505+
var newCaretPos = editor.TextArea.Caret.Offset + 1;
506+
var docLength = editor.Document.TextLength;
507+
editor.TextArea.Caret.Offset = newCaretPos > docLength ? docLength : newCaretPos;
508+
}
509+
}
510+
else
511+
{
512+
513+
}
505514
}
506515

507516
break;

UI/Components/EditorElement/Highlighting/BracketHighlightHelpers.cs

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -277,20 +277,9 @@ public static bool CheckForChar(IDocument document, int offset)
277277
/// <returns></returns>
278278
public static bool CheckForClosingBracket(IDocument document, int offset, string bracket)
279279
{
280-
//var a = offset + 1 < document.TextLength;
281-
//var b = document.GetCharAt(offset).ToString() == bracket;
282-
//var c = document.GetCharAt(offset - 1).ToString() == opBracket;
283-
284-
if (offset + 1 < document.TextLength)
285-
{
286-
return
287-
document.GetCharAt(offset).ToString() == bracket &&
288-
document.GetCharAt(offset - 1).ToString() == BracketPairs[bracket];
289-
}
290-
else
291-
{
292-
return true;
293-
}
280+
return
281+
document.GetCharAt(offset).ToString() == bracket &&
282+
document.GetCharAt(offset - 1).ToString() == BracketPairs[bracket];
294283
}
295284
}
296285
}

0 commit comments

Comments
 (0)