Merge pull request #4414 from mono/backport-pr-4413-to-d15-7

[d15-7] Fixes issue #4329 Enum Color Syntax Incorrect
mono · Apr 3, 2018 · 740a89f · 740a89f
2 parents 08f4388 + ad427e0
commit 740a89f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Formats/OldFormat.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/Formats/OldFormat.cs
@@ -260,7 +260,7 @@ static EditorTheme ConvertToEditorTheme (ColorScheme colorScheme)
 			settings.Add (new ThemeSetting ("User Types(Mutable)", new List<string> { EditorThemeColors.UserTypesMutable }, ConvertChunkStyle (colorScheme.UserTypesMutable)));
 
 			settings.Add (new ThemeSetting ("User Field", new List<string> { EditorThemeColors.UserField }, ConvertChunkStyle (colorScheme.UserFieldDeclaration)));
-			settings.Add (new ThemeSetting ("User Enum Member", new List<string> { EditorThemeColors.UserField }, ConvertChunkStyle (colorScheme.UserFieldDeclaration)));
+			settings.Add (new ThemeSetting ("User Enum Member", new List<string> { EditorThemeColors.UserEnumMember }, ConvertChunkStyle (colorScheme.UserVariableDeclaration)));
 			settings.Add (new ThemeSetting ("User Constant", new List<string> { EditorThemeColors.UserConstant }, ConvertChunkStyle (colorScheme.UserFieldDeclaration)));
 
 			settings.Add (new ThemeSetting ("User Property", new List<string> { EditorThemeColors.UserProperty }, ConvertChunkStyle (colorScheme.UserPropertyDeclaration)));

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/StackMatchExpression.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/StackMatchExpression.cs
@@ -214,7 +214,8 @@ public override (bool, ScopeStack) MatchesStack (ScopeStack scopeStack, ref stri
 			{
 				if (scopeStack.IsEmpty)
 					return mismatch;
-				bool found = scopeStack.Peek ().StartsWith (scope, StringComparison.Ordinal);
+				var top = scopeStack.Peek ();
+				bool found = top == scope || top.Length > scope.Length && top.StartsWith (scope, StringComparison.Ordinal) && top[scope.Length] == '.';
 				if (found) {
 					matchExpr = scope;
 					return (found, scopeStack.Pop ());