Merge pull request #20 from kaishuu0123/fix/error-handling

fix error handling and view error message.
kaishuu0123 · Jan 15, 2019 · 124d4fd · 124d4fd
2 parents 0d1d3c1 + 28998b7
commit 124d4fd
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "vscode-erd-preview",
     "displayName": "ERD Preview",
     "description": "An extension for Visual Studio Code to preview erd(.er) files",
-    "version": "3.1.0",
+    "version": "4.0.1",
     "publisher": "kaishuu0123",
     "engines": {
         "vscode": "^1.25.0"

diff --git a/src/commands/savePdf.ts b/src/commands/savePdf.ts
@@ -12,7 +12,13 @@ export class SavePdfCommand extends SaveCommand implements Command {
         return;
     }
 
-    const activeTextEditor = vscode.window.activeTextEditor;
+    if (resource && resource.scheme !== 'file') {
+        vscode
+          .window
+          .showErrorMessage('Please save to file before PDF export.');
+
+        return;
+    }
 
     vscode.window
       .showSaveDialog({
@@ -25,6 +31,9 @@ export class SavePdfCommand extends SaveCommand implements Command {
           if (uri) {
               writeToFile(resource, uri.fsPath, 'pdf');
           }
+      })
+      .then(undefined, err => {
+          console.log(err);
       });
   }
 }
diff --git a/src/commands/savePng.ts b/src/commands/savePng.ts
@@ -12,6 +12,14 @@ export class SavePngCommand extends SaveCommand implements Command {
         return;
     }
 
+    if (resource && resource.scheme !== 'file') {
+        vscode
+          .window
+          .showErrorMessage('Please save to file before PNG export.');
+
+        return;
+    }
+
     vscode.window
       .showSaveDialog({
           defaultUri: resource,
@@ -23,6 +31,9 @@ export class SavePngCommand extends SaveCommand implements Command {
           if (uri) {
               writeToFile(resource, uri.fsPath, 'png');
           }
+      })
+      .then(undefined, err => {
+          console.log(err);
       });
   }
 }
diff --git a/src/commands/saveSvg.ts b/src/commands/saveSvg.ts
@@ -12,7 +12,13 @@ export class SaveSvgCommand extends SaveCommand implements Command {
         return;
     }
 
-    const activeTextEditor = vscode.window.activeTextEditor;
+    if (resource && resource.scheme !== 'file') {
+        vscode
+          .window
+          .showErrorMessage('Please save to file before SVG export.');
+
+        return;
+    }
 
     vscode.window
       .showSaveDialog({
@@ -25,6 +31,9 @@ export class SaveSvgCommand extends SaveCommand implements Command {
           if (uri) {
               writeToFile(resource, uri.fsPath, 'svg');
           }
+      })
+      .then(undefined, err => {
+          console.log(err);
       });
   }
 }