Merge pull request #3 from glektarssza/bugfix/symlink-handling

[Bug Fix] Fixed handling of symbolic links (and broken ones specifically)

Author: glektarssza

.gitignore

@@ -50,3 +50,6 @@ node_modules/
 ## TypeScript ##
 out/
 *.vsix
+
+# Test Symlinks #
+*-symlink

.vscode/launch.json

@@ -1,15 +1,12 @@
-// A launch configuration that compiles the extension and then opens it inside a new window
 {
-    "version": "0.1.0",
+    "version": "0.2.0",
     "configurations": [
         {
             "name": "Launch Extension",
             "type": "extensionHost",
             "request": "launch",
-            "runtimeExecutable": "${execPath}",
-            "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
-            "sourceMaps": true,
-            "outFiles": ["${workspaceRoot}/out/src"],
+            "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
+            "outFiles": ["${workspaceFolder}/out/**/*.js"],
             "preLaunchTask": "npm"
         },
         {

.vscode/tasks.json

@@ -1,36 +1,15 @@
-// Available variables which can be used inside of strings.
-// ${workspaceRoot}: the root folder of the team
-// ${file}: the current opened file
-// ${fileBasename}: the current opened file's basename
-// ${fileDirname}: the current opened file's dirname
-// ${fileExtname}: the current opened file's extension
-// ${cwd}: the current working directory of the spawned process
-
-// A task runner that calls a custom npm script that compiles the extension.
 {
     "version": "2.0.0",
-
-    // we want to run npm
-    "command": "npm",
-
-    // we run the custom script "compile" as defined in package.json
-    "args": ["run", "compile", "--loglevel", "silent"],
-
-    // The tsc compiler is started in watching mode
-    "isWatching": true,
-
-    // use the standard tsc in watch mode problem matcher to find compile problems in the output.
-    "problemMatcher": "$tsc-watch",
     "tasks": [
         {
             "label": "npm",
             "type": "shell",
             "command": "npm",
-            "args": ["run", "compile", "--loglevel", "silent"],
+            "args": ["run", "build:watch", "--loglevel", "silent"],
             "isBackground": true,
             "problemMatcher": "$tsc-watch",
             "group": {
-                "_id": "build",
+                "kind": "build",
                 "isDefault": false
             }
         }

.vscodeignore

@@ -9,3 +9,4 @@ types/
 tsconfig.json
 vsc-extension-quickstart.md
 .nvmrc
+*-symlink

package.json

@@ -2,7 +2,7 @@
     "name": "glek-advanced-new-file",
     "displayName": "G'lek's Advanced New File",
     "description": "Create files anywhere in your workspace from the keyboard.",
-    "version": "1.5.0",
+    "version": "1.5.1",
     "publisher": "glektarssza",
     "engines": {
         "vscode": "^1.22.0"
@@ -80,6 +80,11 @@
                     "type": "boolean",
                     "default": true,
                     "description": "Whether to use the values from `files.exclude` when deciding which folders to ignore."
+                },
+                "advancedNewFile.showSymlinks": {
+                    "type": "boolean",
+                    "default": true,
+                    "description": "Whether to show symbolic links when listing direcotries."
                 }
             }
         }

src/extension.ts

@@ -85,6 +85,48 @@ function configIgnoredGlobs(root: string): string[] {
     return gitignoreToGlob(configIgnored.join('\n'), {string: true});
 }
 
+function isDirectory(p: string): boolean {
+    return fs.existsSync(p) && fs.lstatSync(p).isDirectory();
+}
+
+function readSymlink(p: string): string | null {
+    if (!isSymlink(p)) {
+        return null;
+    }
+    return fs.readlinkSync(p);
+}
+
+function readSymlinkAbsolute(p: string): string | null {
+    const sp = readSymlink(p);
+    if (!sp) {
+        return null;
+    }
+    return path.resolve(path.dirname(p), sp);
+}
+
+function isSymlink(p: string): boolean {
+    return fs.existsSync(p) && fs.lstatSync(p).isSymbolicLink();
+}
+
+function isValidSymlink(p: string): boolean {
+    const sp = readSymlinkAbsolute(p);
+    if (!sp) {
+        return false;
+    }
+    return fs.existsSync(sp);
+}
+
+function isDirectorySymlink(p: string): boolean {
+    if (!isValidSymlink(p)) {
+        return false;
+    }
+    const sp = readSymlinkAbsolute(p);
+    if (!sp) {
+        return false;
+    }
+    return fs.lstatSync(sp).isDirectory();
+}
+
 function directoriesSync(root: string): FSLocation[] {
     const ignore: string[] = [];
     if (
@@ -96,16 +138,27 @@ function directoriesSync(root: string): FSLocation[] {
     }
     ignore.push(...configIgnoredGlobs(root));
 
-    const results = globSync('**', {cwd: root, ignore: ignore.map(invertGlob)})
+    const results = globSync('**', {
+        cwd: root,
+        ignore: ignore.map(invertGlob),
+        symlinks: vscode.workspace
+            .getConfiguration('advancedNewFile')
+            .get('showSymlinks', true)
+    })
         .map((f): FSLocation => {
             return {
                 relative: path.join(path.sep, f),
                 absolute: path.join(root, f)
             };
         })
-        .filter((f) => fs.statSync(f.absolute).isDirectory())
-        .map((f) => f);
-
+        .filter(
+            (f) =>
+                isDirectory(f.absolute) ||
+                (isDirectorySymlink(f.absolute) &&
+                    vscode.workspace
+                        .getConfiguration('advancedNewFile')
+                        .get('showSymlinks', true))
+        );
     return results;
 }