- Fixed incorrect icon for const fields in Navi Bar

wmjordan · Dec 12, 2018 · 1ae4366 · 1ae4366
1 parent ac5d2b0
commit 1ae4366
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/Codist/Helpers/CodeAnalysisHelper.cs b/Codist/Helpers/CodeAnalysisHelper.cs
@@ -366,14 +366,24 @@ int GetDelegateIcon(DelegateDeclarationSyntax syntax) {
 			}
 			int GetFieldIcon(FieldDeclarationSyntax syntax) {
 				bool isConst = false;
+				var accessibility = Accessibility.Private;
 				foreach (var modifier in syntax.Modifiers) {
 					switch (modifier.Text) {
 						case "const": isConst = true; break;
-						case "public": return isConst ? KnownImageIds.ConstantPublic : KnownImageIds.FieldPublic;
-						case "internal": return isConst ? KnownImageIds.ConstantInternal : KnownImageIds.FieldInternal;
-						case "protected": return isConst ? KnownImageIds.ConstantProtected : KnownImageIds.FieldProtected;
+						case "public": accessibility = Accessibility.Public; break;
+						case "internal":
+							if (accessibility != Accessibility.Protected) {
+								accessibility = Accessibility.Internal;
+							}
+							break;
+						case "protected": accessibility = Accessibility.Protected; break;
 					}
 				}
+				switch (accessibility) {
+					case Accessibility.Public: return isConst ? KnownImageIds.ConstantPublic : KnownImageIds.FieldPublic;
+					case Accessibility.Internal: return isConst ? KnownImageIds.ConstantInternal : KnownImageIds.FieldInternal;
+					case Accessibility.Protected: return isConst ? KnownImageIds.ConstantProtected : KnownImageIds.FieldProtected;
+				}
 				return isConst ? KnownImageIds.ConstantPrivate : KnownImageIds.FieldPrivate;
 			}
 			int GetMethodIcon(MethodDeclarationSyntax syntax) {