Merge branch 'development' of https://github.com/fdorg/flashdevelop into feature/ExtractLocalVariable_improvements

Author: slavara

External/Plugins/ASCompletion/Model/ASFileParser.cs

@@ -1081,7 +1081,7 @@ public void ParseSrc(FileModel fileModel, string ba, bool allowBaReExtract)
                         else if (valueError && c1 == ')') inValue = false;
                         else if (inType && inGeneric && (c1 == '<' || c1 == '.')) continue;
                         else if (inAnonType) continue;
-                        hadWS = true;
+                        else if (c1 != '_') hadWS = true;
                     }
                 }
 
@@ -1223,7 +1223,7 @@ public void ParseSrc(FileModel fileModel, string ba, bool allowBaReExtract)
                             {
                                 if (!inValue && i > 2 && length > 1 && i < len - 3
                                     && char.IsLetterOrDigit(ba[i - 3]) && (char.IsLetter(ba[i]) || (haXe && ba[i] == '{'))
-                                    && (char.IsLetter(buffer[0]) || buffer[0] == '_'))
+                                    && (char.IsLetter(buffer[0]) || buffer[0] == '_' || inType && buffer[0] == '('))
                                 {
                                     if (curMember == null)
                                     {
@@ -1266,7 +1266,7 @@ public void ParseSrc(FileModel fileModel, string ba, bool allowBaReExtract)
                                 if (!inValue)
                                 {
                                     addChar = true;
-                                    if (c1 == '>' && inGeneric)
+                                    if (c1 == '>')
                                     {
                                         if (paramTempCount > 0) paramTempCount--;
                                         if (paramTempCount == 0 && paramBraceCount == 0
@@ -1280,7 +1280,14 @@ public void ParseSrc(FileModel fileModel, string ba, bool allowBaReExtract)
                                 {
                                     paramParCount--;
                                     addChar = true;
-                                }// else inType = false, error? it may depend on the context
+                                }
+                                else if (paramParCount == 0 && paramTempCount == 0 && paramBraceCount == 0
+                                    && paramSqCount == 0)
+                                {
+                                    inType = false;
+                                    shortcut = false;
+                                    evalToken = 1;
+                                }
                             }
                             else if (c1 == '(' && haXe && inType)
                             {

External/Plugins/ASCompletion/PluginUI.cs

@@ -18,6 +18,7 @@
 using PluginCore.Helpers;
 using PluginCore.Localization;
 using PluginCore.Managers;
+using PluginCore.Controls;
 
 namespace ASCompletion
 {
@@ -138,6 +139,7 @@ private void InitializeControls()
             outlineTree.ShowNodeToolTips = true;
             Controls.Add(outlineTree);
             outlineTree.BringToFront();
+            ScrollBarEx.Attach(outlineTree);
         }
 
         private void TreeIcons_Populate(object sender, EventArgs e)

External/Plugins/ASCompletion/Win32/FixedTreeView.cs

@@ -5,7 +5,7 @@
  * - extends StateSavingTreeView
  */
 using PluginCore;
-using System.Runtime.InteropServices;
+using System.Drawing;
 
 namespace System.Windows.Forms
 {
@@ -134,6 +134,17 @@ protected override void OnPaint(PaintEventArgs e)
             base.OnPaint(e);
         }
 
+        protected override void WndProc(ref Message message)
+        {
+            switch (message.Msg)
+            {
+                case 0xf: // WM_PAINT
+                    OnPaint(new PaintEventArgs(Graphics.FromHwnd(this.Handle), this.Bounds));
+                    break;
+            }
+            base.WndProc(ref message);
+        }
+
     }
 
 }

External/Plugins/CodeRefactor/Controls/RefactorMenu.cs

@@ -10,9 +10,9 @@ public class RefactorMenu : ToolStripMenuItem
         public RefactorMenu(Boolean createSurroundMenu)
         {
             this.Text = TextHelper.GetString("Label.Refactor");
-            this.MoveMenuItem = this.DropDownItems.Add(TextHelper.GetString("Label.Move")) as ToolStripMenuItem;
             this.RenameMenuItem = this.DropDownItems.Add(TextHelper.GetString("Label.Rename")) as ToolStripMenuItem;
             this.RenameMenuItem.Image = PluginBase.MainForm.FindImage("331");
+            this.MoveMenuItem = this.DropDownItems.Add(TextHelper.GetString("Label.Move")) as ToolStripMenuItem;
             this.ExtractMethodMenuItem = this.DropDownItems.Add(TextHelper.GetString("Label.ExtractMethod"), null) as ToolStripMenuItem;
             this.ExtractLocalVariableMenuItem = this.DropDownItems.Add(TextHelper.GetString("Label.ExtractLocalVariable"), null) as ToolStripMenuItem;
             this.DelegateMenuItem = this.DropDownItems.Add(TextHelper.GetString("Label.DelegateMethods"), null) as ToolStripMenuItem;

External/Plugins/ProjectManager/Controls/OpenResourceForm.cs

@@ -210,7 +210,6 @@ private void OpenResourceFormActivated(Object sender, EventArgs e)
                 this.textBox.Focus();
                 this.textBox.Text = previousSearch;
                 this.textBox.SelectAll();
-                
                 this.UpdateOpenFiles();
                 this.textBox.Focus();
             }

External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/CURRENT

@@ -1,5 +1,9 @@
 ### Default.fdi
 
+# FD UI THEME (5.2+)
+
+#ScrollBar.UseGlobally=True
+
 # FD UI THEME (5.1+)
 
 # System, Professional

External/Themes/FullThemes/DefaultTheme/$(BaseDir)/Settings/Themes/Default.fdi

@@ -1,5 +1,9 @@
 ### Default.fdi
 
+# FD UI THEME (5.2+)
+
+#ScrollBar.UseGlobally=True
+
 # FD UI THEME (5.1+)
 
 # System, Professional

External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/CURRENT

@@ -1,5 +1,9 @@
 ### DimGray.fdi
 
+# FD UI THEME (5.2+)
+
+#ScrollBar.UseGlobally=True
+
 # FD UI THEME (5.1+)
 
 # System, Professional

External/Themes/FullThemes/DimGrayTheme/$(BaseDir)/Settings/Themes/DimGray.fdi

@@ -1,5 +1,9 @@
 ### DimGray.fdi
 
+# FD UI THEME (5.2+)
+
+#ScrollBar.UseGlobally=True
+
 # FD UI THEME (5.1+)
 
 # System, Professional

External/Themes/FullThemes/ObsidianTheme/$(BaseDir)/Settings/Themes/CURRENT

@@ -1,5 +1,9 @@
 ### Obsidian.fdi
 
+# FD UI THEME (5.2+)
+
+ScrollBar.UseGlobally=True
+
 # FD UI THEME (5.1+)
 
 # System, Professional