Fixes microsoft#31144: Grunt task detection fails for gruntfile.js

dbaeumer · dbaeumer · commit a7f070e2df42 · 2017-08-25T11:00:55.000+02:00
diff --git a/extensions/grunt/src/main.ts b/extensions/grunt/src/main.ts
@@ -20,7 +20,7 @@ export function activate(_context: vscode.ExtensionContext): void {
 	if (!workspaceRoot) {
 		return;
 	}
-	let pattern = path.join(workspaceRoot, 'Gruntfile.js');
+	let pattern = path.join(workspaceRoot, '[Gg]runtfile.js');
 	let detectorPromise: Thenable<vscode.Task[]> | undefined = undefined;
 	let fileWatcher = vscode.workspace.createFileSystemWatcher(pattern);
 	fileWatcher.onDidChange(() => detectorPromise = undefined);
@@ -115,8 +115,7 @@ async function getGruntTasks(): Promise<vscode.Task[]> {
 	if (!workspaceRoot) {
 		return emptyTasks;
 	}
-	let gruntfile = path.join(workspaceRoot, 'Gruntfile.js');
-	if (!await exists(gruntfile)) {
+	if (!await exists(path.join(workspaceRoot, 'gruntfile.js')) && !await exists(path.join(workspaceRoot, 'Gruntfile.js'))) {
 		return emptyTasks;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ export function activate(_context: vscode.ExtensionContext): void {`
`20`	`20`	`if (!workspaceRoot) {`
`21`	`21`	`return;`
`22`	`22`	`}`
`23`		`- let pattern = path.join(workspaceRoot, 'Gruntfile.js');`
	`23`	`+ let pattern = path.join(workspaceRoot, '[Gg]runtfile.js');`
`24`	`24`	`let detectorPromise: Thenable<vscode.Task[]> \| undefined = undefined;`
`25`	`25`	`let fileWatcher = vscode.workspace.createFileSystemWatcher(pattern);`
`26`	`26`	`fileWatcher.onDidChange(() => detectorPromise = undefined);`
`@@ -115,8 +115,7 @@ async function getGruntTasks(): Promise<vscode.Task[]> {`
`115`	`115`	`if (!workspaceRoot) {`
`116`	`116`	`return emptyTasks;`
`117`	`117`	`}`
`118`		`- let gruntfile = path.join(workspaceRoot, 'Gruntfile.js');`
`119`		`- if (!await exists(gruntfile)) {`
	`118`	`+ if (!await exists(path.join(workspaceRoot, 'gruntfile.js')) && !await exists(path.join(workspaceRoot, 'Gruntfile.js'))) {`
`120`	`119`	`return emptyTasks;`
`121`	`120`	`}`
`122`	`121`