Convert Git StatusCode enum to string literal type (#824)

railsware · Oct 17, 2016 · 089158d · 089158d
1 parent b913e1c
commit 089158d
Show file tree

Hide file tree

Showing 2 changed files with 89 additions and 90 deletions.
diff --git a/src/plugins/autocompletion_utils/Common.ts b/src/plugins/autocompletion_utils/Common.ts
@@ -264,38 +264,38 @@ export const emptyProvider = mk(async() => []);
 
 function gitStatusCodeColor(statusCode: StatusCode) {
     switch (statusCode) {
-        case StatusCode.StagedModified:
-        case StatusCode.StagedAdded:
-        case StatusCode.StagedDeleted:
-        case StatusCode.StagedRenamed:
-        case StatusCode.StagedCopied:
+        case "StagedModified":
+        case "StagedAdded":
+        case "StagedDeleted":
+        case "StagedRenamed":
+        case "StagedCopied":
             return colors.green;
 
-        case StatusCode.StagedCopiedUnstagedModified:
-        case StatusCode.StagedCopiedUnstagedDeleted:
-        case StatusCode.StagedRenamedUnstagedModified:
-        case StatusCode.StagedRenamedUnstagedDeleted:
-        case StatusCode.StagedDeletedUnstagedModified:
-        case StatusCode.StagedAddedUnstagedModified:
-        case StatusCode.StagedAddedUnstagedDeleted:
-        case StatusCode.StagedModifiedUnstagedModified:
-        case StatusCode.StagedModifiedUnstagedDeleted:
+        case "StagedCopiedUnstagedModified":
+        case "StagedCopiedUnstagedDeleted":
+        case "StagedRenamedUnstagedModified":
+        case "StagedRenamedUnstagedDeleted":
+        case "StagedDeletedUnstagedModified":
+        case "StagedAddedUnstagedModified":
+        case "StagedAddedUnstagedDeleted":
+        case "StagedModifiedUnstagedModified":
+        case "StagedModifiedUnstagedDeleted":
             return colors.blue;
 
-        case StatusCode.UnstagedDeleted:
-        case StatusCode.UnmergedBothDeleted:
-        case StatusCode.UnmergedAddedByUs:
-        case StatusCode.UnmergedDeletedByThem:
-        case StatusCode.UnmergedAddedByThem:
-        case StatusCode.UnmergedDeletedByUs:
-        case StatusCode.UnmergedBothAdded:
-        case StatusCode.UnmergedBothModified:
-        case StatusCode.Untracked:
-        case StatusCode.Ignored:
-        case StatusCode.Invalid:
+        case "UnstagedDeleted":
+        case "UnmergedBothDeleted":
+        case "UnmergedAddedByUs":
+        case "UnmergedDeletedByThem":
+        case "UnmergedAddedByThem":
+        case "UnmergedDeletedByUs":
+        case "UnmergedBothAdded":
+        case "UnmergedBothModified":
+        case "Untracked":
+        case "Ignored":
+        case "Invalid":
             return colors.red;
 
-        case StatusCode.Unmodified:
+        case "Unmodified":
             return colors.white;
         default:
             console.error(`Unhandled git status code: ${statusCode}`);

diff --git a/src/utils/Git.ts b/src/utils/Git.ts
@@ -21,73 +21,72 @@ export interface ConfigVariable {
     value: string;
 }
 
-export enum StatusCode {
-    Unmodified,
-
-    UnstagedModified,
-    UnstagedDeleted,
-    StagedModified,
-    StagedModifiedUnstagedModified,
-    StagedModifiedUnstagedDeleted,
-    StagedAdded,
-    StagedAddedUnstagedModified,
-    StagedAddedUnstagedDeleted,
-    StagedDeleted,
-    StagedDeletedUnstagedModified,
-    StagedRenamed,
-    StagedRenamedUnstagedModified,
-    StagedRenamedUnstagedDeleted,
-    StagedCopied,
-    StagedCopiedUnstagedModified,
-    StagedCopiedUnstagedDeleted,
-
-    UnmergedBothDeleted,
-    UnmergedAddedByUs,
-    UnmergedDeletedByThem,
-    UnmergedAddedByThem,
-    UnmergedDeletedByUs,
-    UnmergedBothAdded,
-    UnmergedBothModified,
-
-    Untracked,
-    Ignored,
-
-    Invalid,
-}
+export type StatusCode =
+    "Unmodified" |
+
+    "UnstagedModified" |
+    "UnstagedDeleted" |
+    "StagedModified" |
+    "StagedModifiedUnstagedModified" |
+    "StagedModifiedUnstagedDeleted" |
+    "StagedAdded" |
+    "StagedAddedUnstagedModified" |
+    "StagedAddedUnstagedDeleted" |
+    "StagedDeleted" |
+    "StagedDeletedUnstagedModified" |
+    "StagedRenamed" |
+    "StagedRenamedUnstagedModified" |
+    "StagedRenamedUnstagedDeleted" |
+    "StagedCopied" |
+    "StagedCopiedUnstagedModified" |
+    "StagedCopiedUnstagedDeleted" |
+
+    "UnmergedBothDeleted" |
+    "UnmergedAddedByUs" |
+    "UnmergedDeletedByThem" |
+    "UnmergedAddedByThem" |
+    "UnmergedDeletedByUs" |
+    "UnmergedBothAdded" |
+    "UnmergedBothModified" |
+
+    "Untracked" |
+    "Ignored" |
+
+    "Invalid"
 
 function lettersToStatusCode(letters: string): StatusCode {
     switch (letters) {
-        case "  ": return StatusCode.Unmodified;
-
-        case " M": return StatusCode.UnstagedModified;
-        case " D": return StatusCode.UnstagedDeleted;
-        case "M ": return StatusCode.StagedModified;
-        case "MM": return StatusCode.StagedModifiedUnstagedModified;
-        case "MD": return StatusCode.StagedModifiedUnstagedDeleted;
-        case "A ": return StatusCode.StagedAdded;
-        case "AM": return StatusCode.StagedAddedUnstagedModified;
-        case "AD": return StatusCode.StagedAddedUnstagedDeleted;
-        case "D ": return StatusCode.StagedDeleted;
-        case "DM": return StatusCode.StagedDeletedUnstagedModified;
-        case "R ": return StatusCode.StagedRenamed;
-        case "RM": return StatusCode.StagedRenamedUnstagedModified;
-        case "RD": return StatusCode.StagedRenamedUnstagedDeleted;
-        case "C ": return StatusCode.StagedCopied;
-        case "CM": return StatusCode.StagedCopiedUnstagedModified;
-        case "CD": return StatusCode.StagedCopiedUnstagedDeleted;
-
-        case "DD": return StatusCode.UnmergedBothDeleted;
-        case "AU": return StatusCode.UnmergedAddedByUs;
-        case "UD": return StatusCode.UnmergedDeletedByThem;
-        case "UA": return StatusCode.UnmergedAddedByThem;
-        case "DU": return StatusCode.UnmergedDeletedByUs;
-        case "AA": return StatusCode.UnmergedBothAdded;
-        case "UU": return StatusCode.UnmergedBothModified;
-
-        case "??": return StatusCode.Untracked;
-        case "!!": return StatusCode.Ignored;
-
-        default: return StatusCode.Invalid;
+        case "  ": return "Unmodified";
+
+        case " M": return "UnstagedModified";
+        case " D": return "UnstagedDeleted";
+        case "M ": return "StagedModified";
+        case "MM": return "StagedModifiedUnstagedModified";
+        case "MD": return "StagedModifiedUnstagedDeleted";
+        case "A ": return "StagedAdded";
+        case "AM": return "StagedAddedUnstagedModified";
+        case "AD": return "StagedAddedUnstagedDeleted";
+        case "D ": return "StagedDeleted";
+        case "DM": return "StagedDeletedUnstagedModified";
+        case "R ": return "StagedRenamed";
+        case "RM": return "StagedRenamedUnstagedModified";
+        case "RD": return "StagedRenamedUnstagedDeleted";
+        case "C ": return "StagedCopied";
+        case "CM": return "StagedCopiedUnstagedModified";
+        case "CD": return "StagedCopiedUnstagedDeleted";
+
+        case "DD": return "UnmergedBothDeleted";
+        case "AU": return "UnmergedAddedByUs";
+        case "UD": return "UnmergedDeletedByThem";
+        case "UA": return "UnmergedAddedByThem";
+        case "DU": return "UnmergedDeletedByUs";
+        case "AA": return "UnmergedBothAdded";
+        case "UU": return "UnmergedBothModified";
+
+        case "??": return "Untracked";
+        case "!!": return "Ignored";
+
+        default: return "Invalid";
     }
 }