Fix indent on newline on while in {}-braces caused by smart-indent, some cleanup

Gama11 · Gama11 · commit 2ad377bd0fcd · 2014-09-23T17:22:29.000+02:00
diff --git a/External/Plugins/ASCompletion/Completion/ASComplete.cs b/External/Plugins/ASCompletion/Completion/ASComplete.cs
@@ -260,7 +260,7 @@ static public bool OnShortcut(Keys keys, ScintillaControl Sci)
 			}
             else if (keys == Keys.Back)
             {
-                HandleAddClosingBraces(Sci, (char)Sci.CharAt(Sci.CurrentPos), false);
+                HandleAddClosingBraces(Sci, Sci.CurrentChar, false);
                 return false;
             }
 			// show calltip
@@ -437,10 +437,9 @@ private static void HandleAddBrace(ScintillaControl sci, char c, Braces braces)
                 else if (c == braces.closing)
                 {
                     // already a closing brace?
-                    if ((char)sci.CharAt(sci.CurrentPos) == braces.closing)
+                    if (sci.CurrentChar == braces.closing)
                     {
-                        sci.SetSel(sci.CurrentPos + 1, sci.CurrentPos + 1);
-                        sci.DeleteBack();
+                        sci.DeleteForward();
                     }
                 }
             }
@@ -452,8 +451,7 @@ private static void HandleRemoveBrace(ScintillaControl sci, char c, Braces brace
             {
                 if ((char)sci.CharAt(sci.CurrentPos - 1) == braces.opening)
                 {
-                    sci.SetSel(sci.CurrentPos + 1, sci.CurrentPos + 1);
-                    sci.DeleteBack();
+                    sci.DeleteForward();
                 }
             }
         }
@@ -1011,8 +1009,13 @@ static private void HandleStructureCompletion(ScintillaControl Sci)
 				string txt = Sci.GetLine(line-1).TrimEnd();
 				int style = Sci.BaseStyleAt(position);
 
-				// in comments
-                if (PluginBase.Settings.CommentBlockStyle == CommentBlockStyle.Indented && txt.EndsWith("*/"))
+                if (Sci.CurrentChar == '}')
+                {
+                    Sci.DeleteForward();
+                    AutoCloseBrace(Sci, line);
+                }
+                // in comments
+                else if (PluginBase.Settings.CommentBlockStyle == CommentBlockStyle.Indented && txt.EndsWith("*/"))
                     FixIndentationAfterComments(Sci, line);
                 else if (IsCommentStyle(style) && (Sci.BaseStyleAt(position + 1) == style))
                     FormatComments(Sci, txt, line);
diff --git a/External/Plugins/BasicCompletion/PluginMain.cs b/External/Plugins/BasicCompletion/PluginMain.cs
@@ -426,7 +426,7 @@ private void SciControlCharAdded(ScintillaControl sci, Int32 value)
                 Language config = ScintillaControl.Configuration.GetLanguage(lang);
                 String characters = config.characterclass.Characters;
                 // Do not autocomplete in word
-                Char c = (char)sci.CharAt(sci.CurrentPos);
+                Char c = sci.CurrentChar;
                 if (characters.IndexOf(c) >= 0) return;
                 // Autocomplete after typing word chars only
                 if (characters.IndexOf((char)value) < 0) return;
diff --git a/PluginCore/ScintillaNet/ScintillaControl.cs b/PluginCore/ScintillaNet/ScintillaControl.cs
@@ -937,6 +937,17 @@ public int CurrentPos
 				SPerform(2141, (uint)value , 0);
 			}
 		}
+
+        /// <summary>
+        /// Returns the chracter at the caret posiion.
+        /// </summary>
+        public char CurrentChar
+        {
+            get
+            {
+                return (char)CharAt(CurrentPos);
+            }
+        }
 		
 		/// <summary>
 		/// Returns the position of the opposite end of the selection to the caret.
@@ -3852,7 +3863,16 @@ public void Cancel()
 		public void DeleteBack()
 		{
 			SPerform(2326, 0, 0);
-		}	
+		}
+
+        /// <summary>
+        /// Delete the character after the caret.
+        /// </summary>
+        public void DeleteForward()
+        {
+            SetSel(CurrentPos + 1, CurrentPos + 1);
+            DeleteBack();
+        }
 						
 		/// <summary>
 		/// If selection is empty or all on one line replace the selection with a tab character.

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ static public bool OnShortcut(Keys keys, ScintillaControl Sci)`
`260`	`260`	`}`
`261`	`261`	`else if (keys == Keys.Back)`
`262`	`262`	`{`
`263`		`- HandleAddClosingBraces(Sci, (char)Sci.CharAt(Sci.CurrentPos), false);`
	`263`	`+ HandleAddClosingBraces(Sci, Sci.CurrentChar, false);`
`264`	`264`	`return false;`
`265`	`265`	`}`
`266`	`266`	`// show calltip`
`@@ -437,10 +437,9 @@ private static void HandleAddBrace(ScintillaControl sci, char c, Braces braces)`
`437`	`437`	`else if (c == braces.closing)`
`438`	`438`	`{`
`439`	`439`	`// already a closing brace?`
`440`		`- if ((char)sci.CharAt(sci.CurrentPos) == braces.closing)`
	`440`	`+ if (sci.CurrentChar == braces.closing)`
`441`	`441`	`{`
`442`		`- sci.SetSel(sci.CurrentPos + 1, sci.CurrentPos + 1);`
`443`		`- sci.DeleteBack();`
	`442`	`+ sci.DeleteForward();`
`444`	`443`	`}`
`445`	`444`	`}`
`446`	`445`	`}`
`@@ -452,8 +451,7 @@ private static void HandleRemoveBrace(ScintillaControl sci, char c, Braces brace`
`452`	`451`	`{`
`453`	`452`	`if ((char)sci.CharAt(sci.CurrentPos - 1) == braces.opening)`
`454`	`453`	`{`
`455`		`- sci.SetSel(sci.CurrentPos + 1, sci.CurrentPos + 1);`
`456`		`- sci.DeleteBack();`
	`454`	`+ sci.DeleteForward();`
`457`	`455`	`}`
`458`	`456`	`}`
`459`	`457`	`}`
`@@ -1011,8 +1009,13 @@ static private void HandleStructureCompletion(ScintillaControl Sci)`
`1011`	`1009`	`string txt = Sci.GetLine(line-1).TrimEnd();`
`1012`	`1010`	`int style = Sci.BaseStyleAt(position);`
`1013`	`1011`
`1014`		`- // in comments`
`1015`		`- if (PluginBase.Settings.CommentBlockStyle == CommentBlockStyle.Indented && txt.EndsWith("*/"))`
	`1012`	`+ if (Sci.CurrentChar == '}')`
	`1013`	`+ {`
	`1014`	`+ Sci.DeleteForward();`
	`1015`	`+ AutoCloseBrace(Sci, line);`
	`1016`	`+ }`
	`1017`	`+ // in comments`
	`1018`	`+ else if (PluginBase.Settings.CommentBlockStyle == CommentBlockStyle.Indented && txt.EndsWith("*/"))`
`1016`	`1019`	`FixIndentationAfterComments(Sci, line);`
`1017`	`1020`	`else if (IsCommentStyle(style) && (Sci.BaseStyleAt(position + 1) == style))`
`1018`	`1021`	`FormatComments(Sci, txt, line);`