Fix projectCreator, and disallow relative paths during project creation

Closes #102
wpilibsuite · Oct 15, 2018 · f7b68a6 · f7b68a6
1 parent ecf6335
commit f7b68a6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/vscode-wpilib/resources/webviews/projectcreator.html b/vscode-wpilib/resources/webviews/projectcreator.html
@@ -3,10 +3,6 @@
 
 <head>
   <title>WPILib Project Create</title>
-  <script>
-    replacescript
-  </script>
-
   <style>
     .error {
       color: red;

diff --git a/vscode-wpilib/src/webviews/eclipseimport.ts b/vscode-wpilib/src/webviews/eclipseimport.ts
@@ -110,6 +110,10 @@ export class EclipseImport extends WebViewBase {
   }
 
   private async handleImport(data: IEclipseIPCData) {
+    if (!path.isAbsolute(data.toFolder)) {
+      await vscode.window.showErrorMessage('Can only extract to absolute path');
+      return;
+    }
     const oldProjectPath = path.dirname(data.fromProps);
 
     const cpp = await promisifyExists(path.join(oldProjectPath, '.cproject'));

diff --git a/vscode-wpilib/src/webviews/projectcreator.ts b/vscode-wpilib/src/webviews/projectcreator.ts
@@ -66,6 +66,10 @@ export class ProjectCreator extends WebViewBase {
   }
 
   private async createProject(data: IProjectIPCData) {
+    if (!path.isAbsolute(data.toFolder)) {
+      await vscode.window.showErrorMessage('Can only extract to absolute path');
+      return;
+    }
     await this.exampleTemplateApi.createProject(data.template, data.language, data.base, data.toFolder, data.newFolder,
       data.projectName, parseInt(data.teamNumber, 10));
   }
@@ -129,6 +133,6 @@ export class ProjectCreator extends WebViewBase {
 
   private async asyncInitialize() {
     await this.loadWebpage(path.join(extensionContext.extensionPath, 'resources', 'webviews', 'projectcreator.html'),
-      path.join(extensionContext.extensionPath, 'resources', 'webviews', 'out', 'projectcreator.js'));
+      path.join(extensionContext.extensionPath, 'resources', 'dist', 'projectcreatorpage.js'));
   }
 }