Merge pull request #15 from andy-viv/semicolon-option

add semicolon config option
NuclleaR · Jul 18, 2018 · 151c486 · 151c486
2 parents 27ab939 + 8352289
commit 151c486
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -79,17 +79,22 @@
         "autoimport.showNotifications": {
           "type": "boolean",
           "default": false,
-          "description": "Specifies wether to show notifications from Auto Import"
+          "description": "Specifies whether to show notifications from Auto Import"
         },
         "autoimport.doubleQuotes": {
           "type": "boolean",
           "default": false,
-          "description": "Specifies wether to use double quotes"
+          "description": "Specifies whether to use double quotes"
+        },
+        "autoimport.semicolon": {
+          "type": "boolean",
+          "default": true,
+          "description": "Specifies whether to use a semicolon at the end of the line"
         },
         "autoimport.spaceBetweenBraces": {
           "type": "boolean",
           "default": true,
-          "description": "Specifies wether to use spaces between first and last brace"
+          "description": "Specifies whether to use spaces between first and last brace"
         },
         "autoimport.autoComplete": {
           "type": "boolean",

diff --git a/src/import-fixer.ts b/src/import-fixer.ts
@@ -7,12 +7,14 @@ export class ImportFixer {
 
     private spacesBetweenBraces;
     private doubleQuotes;
+    private semicolon;
 
     constructor() {
         let config = vscode.workspace.getConfiguration('autoimport');
 
         this.spacesBetweenBraces = config.get<boolean>('spaceBetweenBraces');
         this.doubleQuotes = config.get<boolean>('doubleQuotes');
+        this.semicolon = config.get<boolean>('semicolon');
     }
 
     public fix(document: vscode.TextDocument, range: vscode.Range,
@@ -110,7 +112,8 @@ export class ImportFixer {
             isDefault ? '' : this.spacesBetweenBraces ? ' }' : '}',
             ' from ',
             quoteSymbol + formattedPath + quoteSymbol,
-            endline ? ';\r\n' : ';',
+            this.semicolon ? ';' : '',
+            endline ? '\r\n' : '',
         ].join('');
         return importStr;
     }