Fix #18 - Add Closing Brackets for methodmaps functions

Hexer10 · Hexer10 · commit 4a5e2eb56aff · 2020-04-10T23:02:10.000+02:00
diff --git a/App/AssemblyInfo1.cs b/App/AssemblyInfo1.cs
@@ -33,5 +33,5 @@
 #if (DEBUG)
 [assembly: AssemblyVersion("1.12.*")]
 #else
-[assembly: AssemblyVersion("1.3.5.2")]
+[assembly: AssemblyVersion("1.3.5.3")]
 #endif
diff --git a/UI/Components/IntelliSenseController.cs b/UI/Components/IntelliSenseController.cs
@@ -376,22 +376,23 @@ private bool ISAC_EvaluateKeyDownEvent(Key k)
                             endOffset = i;
                         }
 
-                        var length = startOffset - endOffset + 1;
+                        var length = startOffset - endOffset;
                         string replaceString;
                         if (AC_IsFuncC)
                         {
                             replaceString = ((ACNode) AutoCompleteBox.SelectedItem).EntryName;
                             if (acEntrys[AutoCompleteBox.SelectedIndex].IsExecuteable)
-                                replaceString = replaceString + "(";
+                                replaceString += "(" + (Program.OptionsObject.Editor_AutoCloseBrackets ? ")" : "");
                         }
                         else
                         {
                             replaceString = ((ISNode) MethodAutoCompleteBox.SelectedItem).EntryName;
                             if (isEntrys[MethodAutoCompleteBox.SelectedIndex].IsExecuteable)
-                                replaceString = replaceString + "(";
+                                replaceString += "(" + (Program.OptionsObject.Editor_AutoCloseBrackets ? ")" : "");
                         }
 
-                        editor.Document.Replace(endOffset, length, replaceString);
+                        editor.Document.Replace(endOffset, length+1, replaceString);
+                        editor.CaretOffset -= 1;
                         return true;
                     }
                     case Key.Up:

Original file line number	Diff line number	Diff line change
`@@ -376,22 +376,23 @@ private bool ISAC_EvaluateKeyDownEvent(Key k)`
`376`	`376`	`endOffset = i;`
`377`	`377`	`}`
`378`	`378`
`379`		`- var length = startOffset - endOffset + 1;`
	`379`	`+ var length = startOffset - endOffset;`
`380`	`380`	`string replaceString;`
`381`	`381`	`if (AC_IsFuncC)`
`382`	`382`	`{`
`383`	`383`	`replaceString = ((ACNode) AutoCompleteBox.SelectedItem).EntryName;`
`384`	`384`	`if (acEntrys[AutoCompleteBox.SelectedIndex].IsExecuteable)`
`385`		`- replaceString = replaceString + "(";`
	`385`	`+ replaceString += "(" + (Program.OptionsObject.Editor_AutoCloseBrackets ? ")" : "");`
`386`	`386`	`}`
`387`	`387`	`else`
`388`	`388`	`{`
`389`	`389`	`replaceString = ((ISNode) MethodAutoCompleteBox.SelectedItem).EntryName;`
`390`	`390`	`if (isEntrys[MethodAutoCompleteBox.SelectedIndex].IsExecuteable)`
`391`		`- replaceString = replaceString + "(";`
	`391`	`+ replaceString += "(" + (Program.OptionsObject.Editor_AutoCloseBrackets ? ")" : "");`
`392`	`392`	`}`
`393`	`393`
`394`		`- editor.Document.Replace(endOffset, length, replaceString);`
	`394`	`+ editor.Document.Replace(endOffset, length+1, replaceString);`
	`395`	`+ editor.CaretOffset -= 1;`
`395`	`396`	`return true;`
`396`	`397`	`}`
`397`	`398`	`case Key.Up:`