removeLeadingDot option added (#24)

* config prop prefixPathWithCurrentDirectory implemented, _workspacePath fixed * prefixPathWithCurrentDirectory reanemed to removeLeadingDot as it as previosly called
dawsbot · Feb 6, 2018 · a571731 · a571731
1 parent b83dd74
commit a571731
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -66,6 +66,11 @@
                         ".js"
                     ],
                     "description": "An array of extensions to exclude from the relative path url (Useful for used with Webpack or when importing files of mixed types)"
+                },
+                "relativePath.removeLeadingDot": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Removes the leading ./ character when the path is pointing to a parent folder."
                 }
             }
         }

diff --git a/src/extension.ts b/src/extension.ts
@@ -85,8 +85,8 @@ class RelativePath {
         const editor = window.activeTextEditor;
         if (editor) {
             const res = editor.document.uri;
-            const folder = workspace.getWorkspaceFolder(res)
-            return folder.uri.fsPath;
+            const folder = workspace.getWorkspaceFolder(res);
+            return folder.uri.fsPath.replace(/\\/g, "/");
         }
     }
     // Purely updates the files
@@ -203,13 +203,11 @@ class RelativePath {
             const currentItemPath = editor.document.fileName.replace(/\\/g, "/").replace(this._workspacePath, "");
             let relativeUrl: string = path.relative(currentItemPath, targetPath).replace(".", "").replace(/\\/g, "/");
 
-            if (this._configuration.removeExtension) {
-                relativeUrl = relativeUrl.substring(0, relativeUrl.lastIndexOf("."));
-            } else if (this.excludeExtensionsFor(relativeUrl)) {
+            if (this._configuration.removeExtension || this.excludeExtensionsFor(relativeUrl)) {
                 relativeUrl = relativeUrl.substring(0, relativeUrl.lastIndexOf("."));
             }
 
-            if (relativeUrl.startsWith("./../")) {
+            if (this._configuration.removeLeadingDot && relativeUrl.startsWith("./../")) {
                 relativeUrl = relativeUrl.substring(2, relativeUrl.length);
             }