Fix prettier and vscode-ext on windows

ebigram · Feb 16, 2019 · 9e2af5d · 9e2af5d
1 parent d9cd82e
commit 9e2af5d
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 44 deletions.
diff --git a/package.json b/package.json
@@ -17,8 +17,8 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "format": "prettier --write '**/*.{js,jsx,md,json,html,css,yml}' --ignore-path .gitignore",
-    "test-prettier": "prettier --check '**/*.{js,jsx,md,json,html,css,yml}' --ignore-path .gitignore",
+    "format": "prettier --write \"**/*.{js,jsx,md,json,html,css,yml}\" --ignore-path .gitignore",
+    "test-prettier": "prettier --check \"**/*.{js,jsx,md,json,html,css,yml}\" --ignore-path .gitignore",
     "test-cra": "react-scripts test",
     "test": "run-s test-prettier test-cra",
     "eject": "react-scripts eject"

diff --git a/vscode-ext/extension.js b/vscode-ext/extension.js
@@ -17,53 +17,58 @@ function activate(context) {
     "extension.git-file-history",
     function() {
       // The code you place here will be executed every time your command is executed
-
-      const currentPath = getCurrentPath();
-      if (!currentPath) {
-        vscode.window.showInformationMessage("No active file");
-        return;
-      }
-
-      const panel = vscode.window.createWebviewPanel(
-        "gfh",
-        `${path.basename(currentPath)} (Git History)`,
-        vscode.ViewColumn.One,
-        {
-          enableScripts: true,
-          retainContextWhenHidden: true,
-          localResourceRoots: [
-            vscode.Uri.file(path.join(context.extensionPath, "site"))
-          ]
+      try {
+        const currentPath = getCurrentPath();
+        if (!currentPath) {
+          vscode.window.showInformationMessage("No active file");
+          return;
         }
-      );
 
-      const indexFile = vscode.Uri.file(
-        path.join(context.extensionPath, "site", "index.html")
-      );
+        const panel = vscode.window.createWebviewPanel(
+          "gfh",
+          `${path.basename(currentPath)} (Git History)`,
+          vscode.ViewColumn.One,
+          {
+            enableScripts: true,
+            retainContextWhenHidden: true,
+            localResourceRoots: [
+              vscode.Uri.file(path.join(context.extensionPath, "site"))
+            ]
+          }
+        );
+        const indexPath = path.join(
+          context.extensionPath,
+          "site",
+          "index.html"
+        );
 
-      const index = fs.readFileSync(indexFile.path, "utf-8");
+        const index = fs.readFileSync(indexPath, "utf-8");
 
-      getCommits(currentPath)
-        .then(commits => {
-          const newIndex = index
-            .replace(
-              "<script>window._CLI=null</script>",
-              `<script>/*<!--*/window._CLI={commits:${JSON.stringify(
-                commits
-              )},path:'${currentPath}'}/*-->*/</script>`
-            )
-            .replace(
-              "<head>",
-              `<head><base href="${vscode.Uri.file(
-                path.join(context.extensionPath, "site")
-              ).with({
-                scheme: "vscode-resource"
-              })}/"/>`
-            );
+        getCommits(currentPath)
+          .then(commits => {
+            const newIndex = index
+              .replace(
+                "<script>window._CLI=null</script>",
+                `<script>/*<!--*/window._CLI={commits:${JSON.stringify(
+                  commits
+                )},path:'${currentPath}'}/*-->*/</script>`
+              )
+              .replace(
+                "<head>",
+                `<head><base href="${vscode.Uri.file(
+                  path.join(context.extensionPath, "site")
+                ).with({
+                  scheme: "vscode-resource"
+                })}/"/>`
+              );
 
-          panel.webview.html = newIndex;
-        })
-        .catch(console.error);
+            panel.webview.html = newIndex;
+          })
+          .catch(console.error);
+      } catch (e) {
+        console.error(e);
+        throw e;
+      }
     }
   );