Merge pull request #46 from GeorgeAlexandria/vs_existing_classification

Append classification for types

Tests/Identifiers/CSharpIdentifiers/Access/Types/ClassType.cs

@@ -0,0 +1,10 @@
+namespace CSharpIdentifiers.Access.Types
+{
+    internal class ClassType
+    {
+        private void Method()
+        {
+            var value = new ClassType();
+        }
+    }
+}

Tests/Identifiers/CSharpIdentifiers/Access/Types/DelegateType.cs

@@ -0,0 +1,9 @@
+namespace CSharpIdentifiers.Access.Types
+{
+    internal class DelegateType
+    {
+        internal delegate void Handle();
+
+        public Handle Handler;
+    }
+}

Tests/Identifiers/CSharpIdentifiers/Access/Types/EnumType.cs

@@ -0,0 +1,11 @@
+namespace CSharpIdentifiers.Access.Types
+{
+    internal class EnumType
+    {
+        internal enum MyEnum
+        {
+        }
+
+        private readonly MyEnum value;
+    }
+}

Tests/Identifiers/CSharpIdentifiers/Access/Types/InterfaceType.cs

@@ -0,0 +1,11 @@
+namespace CSharpIdentifiers.Access.Types
+{
+    internal interface IInterfaceType
+    {
+    }
+
+    internal class InterfaceType
+    {
+        private readonly IInterfaceType value;
+    }
+}

Tests/Identifiers/CSharpIdentifiers/Access/Types/StructureType.cs

@@ -0,0 +1,10 @@
+namespace CSharpIdentifiers.Access.Types
+{
+    internal struct StructureType
+    {
+        private void Method()
+        {
+            var value = new StructureType();
+        }
+    }
+}

Tests/Identifiers/CSharpIdentifiers/Access/Types/TypeParameter.cs

@@ -0,0 +1,7 @@
+namespace CSharpIdentifiers.Access.Types
+{
+    internal class TypeParameter<TValue> where TValue : new()
+    {
+        private TValue Value => new TValue();
+    }
+}

Tests/Identifiers/CSharpIdentifiers/CSharpIdentifiers.csproj

@@ -48,6 +48,12 @@
     <Compile Include="Access\Methods\Method.cs" />
     <Compile Include="Access\Methods\StaticMethod.cs" />
     <Compile Include="Access\Namespaces\CustomNamespaces.cs" />
+    <Compile Include="Access\Types\ClassType.cs" />
+    <Compile Include="Access\Types\DelegateType.cs" />
+    <Compile Include="Access\Types\EnumType.cs" />
+    <Compile Include="Access\Types\InterfaceType.cs" />
+    <Compile Include="Access\Types\StructureType.cs" />
+    <Compile Include="Access\Types\TypeParameter.cs" />
     <Compile Include="AnalyzeOptions\AliasNamespace.cs" />
     <Compile Include="AnalyzeOptions\LocalVariable.cs" />
     <Compile Include="AnalyzeOptions\Member.cs" />
@@ -117,6 +123,12 @@
     <Compile Include="Declarations\Parameters\Variable.cs" />
     <Compile Include="Declarations\Parameters\Optional.cs" />
     <Compile Include="Declarations\Parameters\SimpleParameter.cs" />
+    <Compile Include="Declarations\Types\ClassType.cs" />
+    <Compile Include="Declarations\Types\DelegateType.cs" />
+    <Compile Include="Declarations\Types\EnumType.cs" />
+    <Compile Include="Declarations\Types\InterfaceType.cs" />
+    <Compile Include="Declarations\Types\StructureType.cs" />
+    <Compile Include="Declarations\Types\TypeParameter.cs" />
     <Compile Include="XmlDocComment\TypeParam.cs" />
     <Compile Include="XmlDocComment\TypeParamRef.cs" />
     <Compile Include="XmlDocComment\CrefAttribute.cs" />

Tests/Identifiers/CSharpIdentifiers/Declarations/Types/ClassType.cs

@@ -0,0 +1,6 @@
+namespace CSharpIdentifiers.Declarations.Types
+{
+    internal class ClassType
+    {
+    }
+}

Tests/Identifiers/CSharpIdentifiers/Declarations/Types/DelegateType.cs

@@ -0,0 +1,4 @@
+namespace CSharpIdentifiers.Declarations.Types
+{
+    internal delegate void Handle();
+}

Tests/Identifiers/CSharpIdentifiers/Declarations/Types/EnumType.cs

@@ -0,0 +1,6 @@
+namespace CSharpIdentifiers.Declarations.Types
+{
+    internal enum EnumType
+    {
+    }
+}

Tests/Identifiers/CSharpIdentifiers/Declarations/Types/InterfaceType.cs

@@ -0,0 +1,6 @@
+namespace CSharpIdentifiers.Declarations.Types
+{
+    internal interface InterfaceType
+    {
+    }
+}

Tests/Identifiers/CSharpIdentifiers/Declarations/Types/StructureType.cs

@@ -0,0 +1,6 @@
+namespace CSharpIdentifiers.Declarations.Types
+{
+    internal struct StructureType
+    {
+    }
+}

Tests/Identifiers/CSharpIdentifiers/Declarations/Types/TypeParameter.cs

@@ -0,0 +1,9 @@
+namespace CSharpIdentifiers.Declarations.Types
+{
+    internal class TypeParameter<TIn>
+    {
+        public void Method<TOther>()
+        {
+        }
+    }
+}

Tests/Identifiers/VisualBasicIdentifiers/Access/Types/ClassType.vb

@@ -0,0 +1,9 @@
+Namespace Access.Types
+
+  Public Class ClassType
+
+    Public field As ClassType
+
+  End Class
+
+End Namespace

Tests/Identifiers/VisualBasicIdentifiers/Access/Types/DelegateType.vb

@@ -0,0 +1,11 @@
+Namespace Access.Types
+
+  Public Class DelegateType
+
+    Public Delegate Sub Handle()
+
+    Public field As Handle
+
+  End Class
+
+End Namespace

Tests/Identifiers/VisualBasicIdentifiers/Access/Types/EnumType.vb

@@ -0,0 +1,13 @@
+Namespace Access.Types
+
+  Public Class EnumType
+
+    Public Enum MyEnum
+      V
+    End Enum
+
+    Public field As MyEnum
+
+  End Class
+
+End Namespace

Tests/Identifiers/VisualBasicIdentifiers/Access/Types/InterfaceType.vb

@@ -0,0 +1,12 @@
+Namespace Access.Types
+
+  Public Class InterfaceType
+
+    Public Interface IInterfaceType
+
+    End Interface
+
+    Public field As IInterfaceType
+  End Class
+
+End Namespace

Tests/Identifiers/VisualBasicIdentifiers/Access/Types/ModuleType.vb

@@ -0,0 +1,11 @@
+Namespace Access.Types
+  Public Module ModuleType
+
+    Public field As Integer
+
+    Sub Method()
+      Dim value = ModuleType.field
+    End Sub
+
+  End Module
+End Namespace

Tests/Identifiers/VisualBasicIdentifiers/Access/Types/StructureType.vb

@@ -0,0 +1,11 @@
+Namespace Access.Types
+
+  Public Structure StructureType
+
+    Sub Method()
+      Dim value = New StructureType()
+    End Sub
+
+  End Structure
+
+End Namespace

Tests/Identifiers/VisualBasicIdentifiers/Access/Types/TypeParameter.vb

@@ -0,0 +1,7 @@
+Namespace Access.Types
+
+  Public Class TypeParameter(Of TValue)
+    Public fiedl As TValue
+  End Class
+
+End Namespace

Tests/Identifiers/VisualBasicIdentifiers/Declarations/Types/ClassType.vb

@@ -0,0 +1,3 @@
+Public Class ClassType
+
+End Class

Tests/Identifiers/VisualBasicIdentifiers/Declarations/Types/DelegateType.vb

@@ -0,0 +1 @@
+Public Delegate Sub DelegateType()

Tests/Identifiers/VisualBasicIdentifiers/Declarations/Types/EnumType.vb

@@ -0,0 +1,3 @@
+Public Enum EnumType
+  V
+End Enum

Tests/Identifiers/VisualBasicIdentifiers/Declarations/Types/InterfaceType.vb

@@ -0,0 +1,3 @@
+Public Interface InterfaceType
+
+End Interface

Tests/Identifiers/VisualBasicIdentifiers/Declarations/Types/ModuleType.vb

@@ -0,0 +1,3 @@
+Module ModuleType
+
+End Module

Tests/Identifiers/VisualBasicIdentifiers/Declarations/Types/StructureType.vb

@@ -0,0 +1,3 @@
+Public Structure StructureType
+
+End Structure

Tests/Identifiers/VisualBasicIdentifiers/Declarations/Types/TypeParameter.vb

@@ -0,0 +1,3 @@
+Public Class TypeParameter(Of TValue)
+
+End Class

Tests/Identifiers/VisualBasicIdentifiers/VisualBasicIdentifiers.vbproj

@@ -89,6 +89,13 @@
     <Compile Include="Access\Parameters\DelegateParameter.vb" />
     <Compile Include="Access\Parameters\OptionalParameter.vb" />
     <Compile Include="Access\Parameters\Variable.vb" />
+    <Compile Include="Access\Types\ClassType.vb" />
+    <Compile Include="Access\Types\DelegateType.vb" />
+    <Compile Include="Access\Types\EnumType.vb" />
+    <Compile Include="Access\Types\InterfaceType.vb" />
+    <Compile Include="Access\Types\ModuleType.vb" />
+    <Compile Include="Access\Types\StructureType.vb" />
+    <Compile Include="Access\Types\TypeParameter.vb" />
     <Compile Include="AnalyzeOptions\LocalVariable.vb" />
     <Compile Include="AnalyzeOptions\Member.vb" />
     <Compile Include="AnalyzeOptions\Method.vb" />
@@ -141,6 +148,13 @@
     <Compile Include="Declarations\Parameters\SimpleParameter.vb" />
     <Compile Include="Declarations\Parameters\TypeCharacter.vb" />
     <Compile Include="Declarations\Parameters\Variable.vb" />
+    <Compile Include="Declarations\Types\ClassType.vb" />
+    <Compile Include="Declarations\Types\DelegateType.vb" />
+    <Compile Include="Declarations\Types\EnumType.vb" />
+    <Compile Include="Declarations\Types\InterfaceType.vb" />
+    <Compile Include="Declarations\Types\ModuleType.vb" />
+    <Compile Include="Declarations\Types\StructureType.vb" />
+    <Compile Include="Declarations\Types\TypeParameter.vb" />
     <Compile Include="Example.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">

src/common/CoCo.MsBuild/MsBuildEngine.cs

@@ -108,13 +108,14 @@ public MsBuildEngine(Logger logger)
             for (int i = 0; i < projectFileNames.Length; ++i)
             {
                 var projectGlobalProperties = globalProperties[i];
-                var properties = new Dictionary<string, string>(projectGlobalProperties.Count);
+                Dictionary<string, string> properties = null;
                 if (projectGlobalProperties != null)
                 {
+                    properties = new Dictionary<string, string>(projectGlobalProperties.Count);
                     var removeProjectProperties = removeGlobalProperties[i];
                     foreach (DictionaryEntry item in projectGlobalProperties)
                     {
-                        if (item.Key is string key && (removeGlobalProperties == null || !removeProjectProperties.Contains(key)))
+                        if (item.Key is string key && (removeProjectProperties is null || !removeProjectProperties.Contains(key)))
                         {
                             properties.Add(key, item.Value as string);
                         }
@@ -131,15 +132,15 @@ public MsBuildEngine(Logger logger)
                     }
                 }
 
-                var project = new Project(projectFileNames[i], properties, existingToolsVersion);
-                var result = project.CreateProjectInstance().Build(targetNames, new ILogger[0], out var targetOuputs);
+                var project = new Project(projectFileNames[i], properties ?? new Dictionary<string, string>(), existingToolsVersion);
+                var result = project.CreateProjectInstance().Build(targetNames, new ILogger[0], out var targetOutputs);
                 if (!result) _logger.Error("{0} project was failed to build", projectFileNames[i]);
                 allSuccess &= result;
 
                 if (returnTargetOutputs)
                 {
-                    var projectTargetOutputs = new Dictionary<string, ITaskItem[]>(targetOuputs.Count);
-                    foreach (var item in targetOuputs)
+                    var projectTargetOutputs = new Dictionary<string, ITaskItem[]>(targetOutputs.Count);
+                    foreach (var item in targetOutputs)
                     {
                         projectTargetOutputs.Add(item.Key, item.Value.Items);
                     }

src/common/CoCo.UI/UI/PresetsControl.xaml

@@ -67,7 +67,6 @@
                      Margin="8,0,8,0"
                      Command="{Binding ApplyPreset}"
                      CommandParameter="{Binding}"
-                     Foreground="#5e5e5a"
                      Style="{StaticResource commonButtonStyle}"
                      Template="{StaticResource ApplyPresetButton}" />
                   <Button

src/common/CoCo.UI/ViewModels/ClassificationColorViewModel.cs

@@ -9,7 +9,8 @@ namespace CoCo.UI.ViewModels
     /// </summary>
     public class ClassificationColorViewModel : BaseViewModel
     {
-        public ClassificationColorViewModel(Color classificationColor, bool colorWasReset, IResetValuesProvider resetValuesProvider)
+        public ClassificationColorViewModel(
+            string classificationName, Color classificationColor, bool colorWasReset, IResetValuesProvider resetValuesProvider)
         {
             _color = classificationColor;
             _colorText = _color.ToString();
@@ -25,7 +26,7 @@ public ClassificationColorViewModel(Color classificationColor, bool colorWasRese
             });
             ResetColor = new DelegateCommand(() =>
             {
-                Color = resetValuesProvider.Foreground;
+                Color = resetValuesProvider.GetForeground(classificationName);
                 ColorWasReset = true;
             });
 

src/common/CoCo.UI/ViewModels/ClassificationViewModel.cs

@@ -22,17 +22,17 @@ public ClassificationViewModel(Classification classification, IResetValuesProvid
             _fontRenderingSize = classification.FontRenderingSize;
 
             Foreground = new ClassificationColorViewModel(
-                classification.Foreground, classification.ForegroundWasReset, resetValuesProvider);
+                _classificationName, classification.Foreground, classification.ForegroundWasReset, resetValuesProvider);
             Background = new ClassificationColorViewModel(
-                classification.Background, classification.BackgroundWasReset, resetValuesProvider);
+                _classificationName, classification.Background, classification.BackgroundWasReset, resetValuesProvider);
 
             _fontRenderingSizeWasReset = classification.FontRenderingSizeWasReset;
 
             DisplayName = classification.DisplayName;
 
             ResetFontRenderingSize = new DelegateCommand(() =>
             {
-                SetProperty(ref _fontRenderingSize, resetValuesProvider.FontRenderingSize, nameof(Size));
+                SetProperty(ref _fontRenderingSize, resetValuesProvider.GetFontRenderingSize(_classificationName), nameof(Size));
                 _fontRenderingSizeWasReset = true;
             });
         }

src/common/CoCo.UI/ViewModels/IResetValuesProvider.cs

@@ -10,10 +10,10 @@ namespace CoCo.UI.ViewModels
     /// </remarks>
     public interface IResetValuesProvider
     {
-        Color Foreground { get; }
+        Color GetForeground(string name);
 
-        Color Background { get; }
+        Color GetBackground(string name);
 
-        int FontRenderingSize { get; }
+        int GetFontRenderingSize(string name);
     }
 }