listen to .jshintignore file changes

microsoft · May 2, 2016 · 49b9258 · 49b9258
1 parent 9dd888d
commit 49b9258
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/jshint-server/src/server.ts b/jshint-server/src/server.ts
@@ -307,7 +307,7 @@ class FileMatcher {
 			if (ignoreFile) {
 				shouldBeExcluded = this.match(processIgnoreFile(ignoreFile), fsPath, this.folderOf(ignoreFile));
 			} else {
-			 	shouldBeExcluded = this.match(this.defaultExcludePatterns, fsPath, root);
+				shouldBeExcluded = this.match(this.defaultExcludePatterns, fsPath, root);
 			}
 
 			this.excludeCache[fsPath] = shouldBeExcluded;
@@ -343,16 +343,36 @@ class Linter {
 			this.validateAll();
 		});
 		this.connection.onDidChangeWatchedFiles(params => {
-			this.options.clear();
-			this.fileMatcher.clear();
-			this.validateAll();
+			var needsValidating = false;
+			if (params.changes) {
+				params.changes.forEach(change => {
+					switch (this.lastSegment(change.uri)) {
+						case JSHINTRC:
+							this.options.clear();
+							needsValidating = true;
+							break;
+						case JSHINTIGNORE:
+							this.fileMatcher.clear();
+							needsValidating = true;
+							break;
+					}
+				});
+			}
+			if (needsValidating) {
+				this.validateAll();
+			}
 		})
 	}
 
 	public listen(): void {
 		this.connection.listen();
 	}
 
+	private lastSegment(fsPath: string): string {
+		let index = fsPath.lastIndexOf('/');
+		return index > -1 ? fsPath.substr(index + 1) : fsPath;
+	}
+
 	private onInitialize(params: InitializeParams): Thenable<InitializeResult | ResponseError<InitializeError>> {
 		this.workspaceRoot = params.rootPath;
 		return Files.resolveModule(this.workspaceRoot, 'jshint').then((value) => {

diff --git a/jshint/extension.ts b/jshint/extension.ts
@@ -21,7 +21,7 @@ export function activate(context: ExtensionContext) {
 		documentSelector: ['javascript', 'javascriptreact'],
 		synchronize: {
 			configurationSection: 'jshint',
-			fileEvents: workspace.createFileSystemWatcher('**/.jshintrc')
+			fileEvents: workspace.createFileSystemWatcher('**/.jshint{rc,ignore}')
 		}
 	}