fix: default colors

Art-Stea1th · Sep 15, 2017 · 60b2f4e · 60b2f4e
1 parent a7b5bb1
commit 60b2f4e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
+/tmp
 
 # Build results
 [Dd]ebug/

diff --git a/Extension/ASD.ESH/ASD.ESH.csproj b/Extension/ASD.ESH/ASD.ESH.csproj
@@ -223,6 +223,7 @@
     <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
     <Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/Extension/ASD.ESH/Classification/Classifier.cs b/Extension/ASD.ESH/Classification/Classifier.cs
@@ -53,6 +53,6 @@ private async Task<IList<ClassificationSpan>> GetSpansAsync(Document document, I
             return resultSpans;
         }
 
-        private static IList<T> EmptyList<T>() => Enumerable.Empty<T>().ToList();
+        private static IList<TItem> EmptyList<TItem>() => Enumerable.Empty<TItem>().ToList();
     }
 }
diff --git a/Extension/ASD.ESH/Classification/TypesRegistry.Definitions.cs b/Extension/ASD.ESH/Classification/TypesRegistry.Definitions.cs
@@ -19,7 +19,7 @@ private sealed class Definitions {
             [ClassificationType(ClassificationTypeNames = pT + nameof(SymbolKind.Field))]
             private sealed class FieldFormatDefinition : FormatDefinition {
                 public FieldFormatDefinition()
-                    : base($"{SymbolKind.Field}", Colors.LightSkyBlue) { }
+                    : base($"{SymbolKind.Field}", "#9CDCFE") { }
             }
 
 
@@ -31,7 +31,7 @@ public FieldFormatDefinition()
             [ClassificationType(ClassificationTypeNames = pT + nameof(SymbolKind.Method))]
             private sealed class MethodFormatDefinition : FormatDefinition {
                 public MethodFormatDefinition()
-                    : base($"{SymbolKind.Method}", Colors.PaleGoldenrod) { }
+                    : base($"{SymbolKind.Method}", "#DCDCAA") { }
             }
 
 
@@ -55,7 +55,7 @@ public NamespaceFormatDefinition()
             [ClassificationType(ClassificationTypeNames = pT + nameof(SymbolKind.Parameter))]
             private sealed class ParameterFormatDefinition : FormatDefinition {
                 public ParameterFormatDefinition()
-                    : base($"{SymbolKind.Parameter}", Colors.Gray) { }
+                    : base($"{SymbolKind.Parameter}", "#808080") { }
             }
 
 
@@ -67,7 +67,7 @@ public ParameterFormatDefinition()
             [ClassificationType(ClassificationTypeNames = pT + nameof(SymbolKind.Property))]
             private sealed class PropertyFormatDefinition : FormatDefinition {
                 public PropertyFormatDefinition()
-                    : base($"{SymbolKind.Property}", Colors.LightSkyBlue) { }
+                    : base($"{SymbolKind.Property}", "#9CDCFE") { }
             }
 
 
@@ -86,8 +86,8 @@ public LocalFormatDefinition()
 
             private abstract class FormatDefinition : ClassificationFormatDefinition {
 
-                public FormatDefinition(string displayName, Color defaultForegroundColor)
-                    : this(displayName) => ForegroundColor = defaultForegroundColor;
+                public FormatDefinition(string displayName, string defaultForegroundColor)
+                    : this(displayName) => ForegroundColor = (Color)ColorConverter.ConvertFromString(defaultForegroundColor);
 
                 public FormatDefinition(string displayName)
                     => DisplayName = $"User Tags - {displayName}";