Fixes #179: nodePath not working (vscode-tslint)

microsoft · Mar 7, 2017 · de2e737 · de2e737
1 parent 7d8f508
commit de2e737
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/server/src/files.ts b/server/src/files.ts
@@ -6,6 +6,7 @@
 
 import * as url from 'url';
 import * as path from 'path';
+import * as fs from 'fs';
 import { exec, spawnSync, fork, ChildProcess } from 'child_process';
 
 /**
@@ -203,13 +204,40 @@ export function resolveGlobalNodePath(tracer?: (message: string) => void): strin
 	return undefined;
 }
 
+
+export namespace FileSystem {
+
+	let _isCaseSensitive: boolean | undefined = undefined;
+	export function isCaseSensitive(): boolean {
+		if (_isCaseSensitive !== void 0) {
+			return _isCaseSensitive;
+		}
+		if (process.platform === 'win32') {
+			_isCaseSensitive = false;
+		} else {
+			// convert current file name to upper case / lower case and check if file exists
+			// (guards against cases when name is already all uppercase or lowercase)
+			_isCaseSensitive = !fs.existsSync(__filename.toUpperCase()) || !fs.existsSync(__filename.toLowerCase());
+		}
+		return _isCaseSensitive;
+	}
+
+	export function isParent(parent: string, child: string): boolean {
+		if (isCaseSensitive()) {
+			return path.normalize(child).indexOf(path.normalize(parent)) === 0;
+		} else {
+			return path.normalize(child).toLowerCase().indexOf(path.normalize(parent).toLowerCase()) == 0;
+		}
+	}
+}
+
 export function resolveModulePath(workspaceRoot: string, moduleName: string, nodePath: string, tracer: (message: string, verbose?: string) => void): Thenable<string> {
 	if (nodePath) {
 		if (!path.isAbsolute(nodePath)) {
 			nodePath = path.join(workspaceRoot, nodePath);
 		}
 		return resolve(moduleName, nodePath, nodePath, tracer).then((value) => {
-			if (value.indexOf(path.normalize(nodePath)) === 0) {
+			if (FileSystem.isParent(nodePath, value)) {
 				return value;
 			} else {
 				return Promise.reject<string>(new Error(`Failed to load ${moduleName} from node path location.`));

diff --git a/server/src/main.ts b/server/src/main.ts
@@ -77,7 +77,6 @@ export namespace Files {
 	export let resolveModule = fm.resolveModule;
 	export let resolveModule2 = fm.resolveModule2;
 	export let resolveModulePath = fm.resolveModulePath;
-
 }
 
 interface ConnectionState {