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

Author: Hosch250

RetailCoder.VBE/Inspections/InspectionsUI.de.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -59,7 +59,7 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
@@ -453,7 +453,7 @@
     <value>Übergebe Parameter als Wert</value>
   </data>
   <data name="QuickFixUseTypedFunction_" xml:space="preserve">
-    <value>Ändere '{0}$' zu '{0}'</value>
+    <value>Ändere '{0}' zu '{1}'</value>
   </data>
   <data name="QuickFix_ThisModule" xml:space="preserve">
     <value>Verarbeite alle Vorkommen im Modul</value>
@@ -521,4 +521,4 @@
   <data name="ObjectVariableNotSetInspectionName" xml:space="preserve">
     <value>Zuweisung in eine Objektvariable benötigt das 'Set'-Schlüsselwort.</value>
   </data>
-</root>
+</root>

RetailCoder.VBE/Inspections/InspectionsUI.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -59,7 +59,7 @@
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
-  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
@@ -453,7 +453,7 @@
     <value>Pass parameter by value</value>
   </data>
   <data name="QuickFixUseTypedFunction_" xml:space="preserve">
-    <value>Change '{0}' to '{0}$'</value>
+    <value>Change '{0}' to '{1}'</value>
   </data>
   <data name="QuickFix_ThisModule" xml:space="preserve">
     <value>Fix all occurrences in module</value>
@@ -522,4 +522,4 @@
   <data name="ObjectVariableNotSetInspectionName" xml:space="preserve">
     <value>Object variable assignment requires 'Set' keyword</value>
   </data>
-</root>
+</root>

RetailCoder.VBE/Inspections/UntypedFunctionUsageInspectionResult.cs

@@ -34,7 +34,7 @@ public override string Description
     public class UntypedFunctionUsageQuickFix : CodeInspectionQuickFix
     {
         public UntypedFunctionUsageQuickFix(ParserRuleContext context, QualifiedSelection selection) 
-            : base(context, selection, string.Format(InspectionsUI.QuickFixUseTypedFunction_, context.GetText()))
+            : base(context, selection, string.Format(InspectionsUI.QuickFixUseTypedFunction_, context.GetText(), context.GetText() + "$"))
         {
         }
 
@@ -49,6 +49,7 @@ public override void Fix()
 
             var result = lines.Replace(originalInstruction, newInstruction);
             module.ReplaceLine(selection.StartLine, result);
+            // FIXME trigger reparse
         }
     }
 }

RetailCoder.VBE/UI/FindSymbol/FindSymbolViewModel.cs

@@ -15,7 +15,8 @@ public class FindSymbolViewModel : INotifyPropertyChanged
         private static readonly DeclarationType[] ExcludedTypes =
         {
             DeclarationType.Control, 
-            DeclarationType.ModuleOption
+            DeclarationType.ModuleOption,
+            DeclarationType.Project
         };
 
         public FindSymbolViewModel(IEnumerable<Declaration> declarations, DeclarationIconCache cache)

Rubberduck.Parsing/Symbols/ReferencedDeclarationsCollector.cs

@@ -186,10 +186,14 @@ public IEnumerable<Declaration> GetDeclarationsForReference(Reference reference)
                 {
                     moduleDeclaration = new ProceduralModuleDeclaration(typeQualifiedMemberName, projectDeclaration, typeName, true, new List<IAnnotation>(), attributes);
                 }
-                else
+                else if (typeDeclarationType == DeclarationType.ClassModule)
                 {
                     moduleDeclaration = new ClassModuleDeclaration(typeQualifiedMemberName, projectDeclaration, typeName, true, new List<IAnnotation>(), attributes, isExposed: true);
                 }
+                else
+                {
+                    moduleDeclaration = new Declaration(typeQualifiedMemberName, projectDeclaration, projectDeclaration, typeName, false, false, Accessibility.Global, typeDeclarationType, null, Selection.Home, true, null, attributes);
+                }
                 yield return moduleDeclaration;
 
                 for (var memberIndex = 0; memberIndex < typeAttributes.cFuncs; memberIndex++)