Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into next

Author: ThunderFrame

RetailCoder.VBE/API/ParserState.cs

@@ -73,7 +73,7 @@ public void Initialize(VBE vbe)
             Func<IVBAPreprocessor> preprocessorFactory = () => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture));
             _attributeParser = new AttributeParser(new ModuleExporter(), preprocessorFactory);
             _parser = new RubberduckParser(vbe, _state, _attributeParser, preprocessorFactory,
-                new List<ICustomDeclarationLoader> { new DebugDeclarations(_state), new FormEventDeclarations(_state), new AliasDeclarations(_state) });
+                new List<ICustomDeclarationLoader> { new DebugDeclarations(_state), new SpecialFormDeclarations(_state), new FormEventDeclarations(_state), new AliasDeclarations(_state) });
         }
 
         /// <summary>

RetailCoder.VBE/App.cs

@@ -84,7 +84,8 @@ private void RefreshSelection()
                 if (!pane.IsWrappingNullReference)
                 {
                     selectedDeclaration = _parser.State.FindSelectedDeclaration(pane);
-                    _stateBar.SetContextSelectionCaption(GetSelectionText(selectedDeclaration));
+                    var caption = _stateBar.GetContextSelectionCaption(_vbe.ActiveCodePane, selectedDeclaration);
+                    _stateBar.SetContextSelectionCaption(caption);
                 }
 
                 var currentStatus = _parser.State.Status;
@@ -99,55 +100,6 @@ private void RefreshSelection()
             }
         }
 
-        private string GetSelectionText(Declaration declaration)
-        {
-            if (declaration == null && _vbe.ActiveCodePane != null)
-            {
-                var selection = _vbe.ActiveCodePane.GetQualifiedSelection();
-                if (selection.HasValue)
-                {
-                    return selection.Value.ToString();
-                }
-            }
-            else if (declaration == null && _vbe.ActiveCodePane == null)
-            {
-                return string.Empty;
-            }
-            else if (declaration != null && !declaration.IsBuiltIn && declaration.DeclarationType != DeclarationType.ClassModule && declaration.DeclarationType != DeclarationType.ProceduralModule)
-            {
-                var typeName = declaration.HasTypeHint
-                    ? Declaration.TypeHintToTypeName[declaration.TypeHint]
-                    : declaration.AsTypeName;
-
-                return string.Format("{0}|{1}: {2} ({3}{4})",
-                    declaration.QualifiedSelection.Selection,
-                    declaration.QualifiedName.QualifiedModuleName,
-                    declaration.IdentifierName,
-                    RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType, UI.Settings.Settings.Culture),
-                    string.IsNullOrEmpty(declaration.AsTypeName) ? string.Empty : ": " + typeName);
-            }
-            else if (declaration != null)
-            {
-                // todo: confirm this is what we want, and then refator
-                var selection = _vbe.ActiveCodePane.GetQualifiedSelection();
-                if (selection.HasValue)
-                {
-                    var typeName = declaration.HasTypeHint
-                        ? Declaration.TypeHintToTypeName[declaration.TypeHint]
-                        : declaration.AsTypeName;
-
-                    return string.Format("{0}|{1}: {2} ({3}{4})",
-                        selection.Value.Selection,
-                        declaration.QualifiedName.QualifiedModuleName,
-                        declaration.IdentifierName,
-                        RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType, UI.Settings.Settings.Culture),
-                        string.IsNullOrEmpty(declaration.AsTypeName) ? string.Empty : ": " + typeName);
-                }
-            }
-
-            return string.Empty;
-        }
-
         private bool ShouldEvaluateCanExecute(Declaration selectedDeclaration, ParserState currentStatus)
         {
             return _lastStatus != currentStatus ||
@@ -194,6 +146,7 @@ public void Startup()
         {
             EnsureLogFolderPathExists();
             LoadConfig();
+            CheckForLegacyIndenterSettings();
             _appMenus.Initialize();
             _stateBar.Initialize();
             _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
@@ -244,6 +197,32 @@ private void LoadConfig()
             }
         }
 
+        private void CheckForLegacyIndenterSettings()
+        {
+            try
+            {
+                Logger.Trace("Checking for legacy Smart Indenter settings.");
+                if (_config.UserSettings.GeneralSettings.SmartIndenterPrompted ||
+                    !_config.UserSettings.IndenterSettings.LegacySettingsExist())
+                {
+                    return;
+                }
+                var response =
+                    _messageBox.Show(RubberduckUI.SmartIndenter_LegacySettingPrompt, "Rubberduck", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+                if (response == DialogResult.Yes)
+                {
+                    Logger.Trace("Attempting to load legacy Smart Indenter settings.");
+                    _config.UserSettings.IndenterSettings.LoadLegacyFromRegistry();
+                }
+                _config.UserSettings.GeneralSettings.SmartIndenterPrompted = true;
+                _configService.SaveConfiguration(_config);
+            }
+            catch 
+            {
+                //Meh.
+            }
+        }
+
         private bool _disposed;
         public void Dispose()
         {

RetailCoder.VBE/Common/StringExtensions.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Rubberduck.Common
+{
+    public static class StringExtensions
+    {
+        public static string Captialize(this string input)
+        {
+            var tokens = input.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+            if (tokens.Length == 0)
+            {
+                return input;
+            }
+            tokens[0] = CultureInfo.CurrentUICulture.TextInfo.ToTitleCase(tokens[0]);
+            return string.Join(" ", tokens);
+        }
+    }
+}

RetailCoder.VBE/Common/UndocumentedAttribute.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace Rubberduck.Common
+{
+    /// <summary>
+    /// Mark a feature as undocumented.
+    /// </summary>
+    /// <remarks>The RubberduckWeb project may this attribute to filter viewable content.</remarks>
+    [AttributeUsage(AttributeTargets.Class)]
+    public class UndocumentedAttribute : Attribute
+    {
+    }
+}

RetailCoder.VBE/Inspections/IInspection.cs renamed to RetailCoder.VBE/Inspections/Abstract/IInspection.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Rubberduck.Root;
 
-namespace Rubberduck.Inspections
+namespace Rubberduck.Inspections.Abstract
 {
     /// <summary>
     /// An interface that abstracts a runnable code inspection.

RetailCoder.VBE/Inspections/IInspectionModel.cs renamed to RetailCoder.VBE/Inspections/Abstract/IInspectionModel.cs

@@ -1,4 +1,6 @@
-namespace Rubberduck.Inspections
+using Rubberduck.Inspections.Resources;
+
+namespace Rubberduck.Inspections.Abstract
 {
     /// <summary>
     /// An interface that abstracts the data structure for a code inspection

RetailCoder.VBE/Inspections/Abstract/IInspectionResult.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using Rubberduck.VBEditor;
+
+namespace Rubberduck.Inspections.Abstract
+{
+    public interface IInspectionResult : IComparable<IInspectionResult>, IComparable
+    {
+        IEnumerable<QuickFixBase> QuickFixes { get; }
+        string Description { get; }
+        QualifiedSelection QualifiedSelection { get; }
+        IInspection Inspection { get; }
+        object[] ToArray();
+    }
+}

RetailCoder.VBE/Inspections/Abstract/IInspector.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Rubberduck.Parsing.VBA;
+
+namespace Rubberduck.Inspections.Abstract
+{
+    public interface IInspector : IDisposable
+    {
+        Task<IEnumerable<IInspectionResult>> FindIssuesAsync(RubberduckParserState state, CancellationToken token);
+    }
+}

RetailCoder.VBE/Inspections/Abstract/IParseTreeInspection.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using Antlr4.Runtime;
+using Rubberduck.Parsing;
+
+namespace Rubberduck.Inspections.Abstract
+{
+    public interface IParseTreeInspection : IInspection
+    {
+        /// <summary>
+        /// Parse tree inspections have their results property-injected.
+        /// </summary>
+        void SetResults(IEnumerable<QualifiedContext> results);
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="TContext"></typeparam>
+    public interface IParseTreeInspection<TContext> : IParseTreeInspection where TContext : ParserRuleContext
+    {
+        IEnumerable<QualifiedContext<TContext>> ParseTreeResults { get; }
+    }
+}

RetailCoder.VBE/Inspections/InspectionBase.cs renamed to RetailCoder.VBE/Inspections/Abstract/InspectionBase.cs

@@ -1,12 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Rubberduck.Inspections.Resources;
 using Rubberduck.Parsing.Annotations;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
-namespace Rubberduck.Inspections
+namespace Rubberduck.Inspections.Abstract
 {
     public abstract class InspectionBase : IInspection
     {