Skip to content
This repository has been archived by the owner on May 21, 2019. It is now read-only.

Convert Git StatusCode enum to string literal type #824

Merged
merged 3 commits into from
Oct 17, 2016
Merged

Convert Git StatusCode enum to string literal type #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bdf5fa
Convert Git StatusCode enum to string literal type
drew-gross Oct 14, 2016
e8f4413
Merge branch 'master' into git-status-to-enum
drew-gross Oct 16, 2016
e7314ca
Merge branch 'master' into git-status-to-enum
drew-gross Oct 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions src/plugins/autocompletion_utils/Common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);
Expand Down
127 changes: 63 additions & 64 deletions src/utils/Git.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
}

Expand Down