Merge branch 'development' into fix/960

Author: elsassph

External/Plugins/ASCompletion/Completion/ASComplete.cs

@@ -1008,13 +1008,16 @@ static private void HandleStructureCompletion(ScintillaControl Sci)
                 int line = Sci.LineFromPosition(position);
                 if (line == 0)
                     return;
-                string txt = Sci.GetLine(line-1).TrimEnd();
+                string txt = Sci.GetLine(line - 1).TrimEnd();
                 int style = Sci.BaseStyleAt(position);
 
+                // move closing brace to its own line and fix indentation
                 if (Sci.CurrentChar == '}')
                 {
-                    Sci.DeleteForward();
-                    AutoCloseBrace(Sci, line);
+                    var openingBrace = Sci.SafeBraceMatch(position);
+                    var openLine = openingBrace >= 0 ? Sci.LineFromPosition(openingBrace) : line - 1;
+                    Sci.InsertText(Sci.CurrentPos, LineEndDetector.GetNewLineMarker(Sci.EOLMode));
+                    Sci.SetLineIndentation(line + 1, Sci.GetLineIndentation(openLine));
                 }
                 // in comments
                 else if (PluginBase.Settings.CommentBlockStyle == CommentBlockStyle.Indented && txt.EndsWith("*/"))

PluginCore/PluginCore/DistroConfig.cs

@@ -9,7 +9,7 @@ public class DistroConfig
         public const String DISTRIBUTION_HELP = "http://www.flashdevelop.org/wikidocs/";
         public const String DISTRIBUTION_VERSION = "http://www.flashdevelop.org/latest.txt";
         public const String DISTRIBUTION_ABOUT = "FlashDevelop logo, domain and the name are copyright of Mika Palmu.\r\nDevelopment: Mika Palmu, Philippe Elsass and all helpful contributors.";
-        public const String DISTRIBUTION_COPYRIGHT = "FlashDevelop.org 2005-2015";
+        public const String DISTRIBUTION_COPYRIGHT = "FlashDevelop.org 2005-2016";
         public const String DISTRIBUTION_COMPANY = "FlashDevelop.org";
         public const String DISTRIBUTION_RSS = "http://www.flashdevelop.org/community/rss.php?f=15";
     }