Add delete button to git branch plugin (#887)

Author: drew-gross

src/plugins/GitBranch.tsx

@@ -57,7 +57,10 @@ class GitBranchComponent extends React.Component<GitBranchProps, GitBranchState>
       <div style={{ padding: "10px" }}>
         {this.state.branches.map((branch, index) =>
           <div key={index.toString()} style={branch.isCurrent() ? {color: colors.green} : {}}>
-            <span style={{whiteSpace: "pre"}}>{branch.isCurrent() ? "* " : "  "}{branch.toString()}</span>
+            <span style={{
+              whiteSpace: "pre",
+              lineHeight: "18px",
+            }}>{branch.isCurrent() ? "* " : "  "}{branch.toString()}</span>
             <Button onClick={async () => {
               try {
                 await executeCommand("git", ["checkout", branch.toString()], this.props.repoRoot);
@@ -66,6 +69,14 @@ class GitBranchComponent extends React.Component<GitBranchProps, GitBranchState>
                 this.setState({ failReason: e.message } as GitBranchState);
               }
             }}>Checkout</Button>
+            <Button color={colors.red} onClick={async () => {
+              try {
+                await executeCommand("git", ["branch", "-d", branch.toString()], this.props.repoRoot);
+                this.reload();
+              } catch (e) {
+                this.setState({ failReason: e.message } as GitBranchState);
+              }
+            }}>Delete</Button>
           </div>
         )}
       </div>

src/plugins/autocompletion_utils/Button.tsx

@@ -1,26 +1,27 @@
 import * as React from "react";
 import {colors} from "../../views/css/colors";
 
-const buttonStyles = {
-  borderColor: colors.blue,
+const buttonStyles = (color: string) => ({
+  borderColor: color,
   borderStyle: "solid",
   borderRadius: "4px",
   borderWidth: "1px",
   padding: "2px",
-  color: colors.blue,
+  color: color,
   WebkitUserSelect: "none",
   fontSize: "10px",
   margin: "4px",
   cursor: "pointer",
-};
+});
 
 type ButtonProps = {
   onClick: () => void;
   children?: React.ReactElement<any>;
+  color?: string;
 };
 
-const Button = ({ onClick, children}: ButtonProps) => <span
-  style={buttonStyles}
+const Button = ({ onClick, children, color = colors.blue }: ButtonProps) => <span
+  style={buttonStyles(color)}
   onClick={onClick}
 >{children}</span>;
 

src/plugins/autocompletion_utils/Common.ts

@@ -283,6 +283,7 @@ function gitStatusCodeColor(statusCode: StatusCode) {
             return colors.blue;
 
         case "UnstagedDeleted":
+        case "UnstagedModified":
         case "UnmergedBothDeleted":
         case "UnmergedAddedByUs":
         case "UnmergedDeletedByThem":