maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix grunt task detector not considering description line wraps

Browse source
This commit is contained in:
Eduardo Pinho 2015-11-18 19:54:24 +00:00
parent 8ff94eaf27
commit 6e5ddd3e7e
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/vs/workbench/parts/tasks/node/processRunnerDetector.ts
View file

@ -63,20 +63,24 @@ class RegexpTaskMatcher implements TaskDetectorMatcher {
class GruntTaskMatcher implements TaskDetectorMatcher {
private tasksStart: boolean;
private tasksEnd: boolean;
private descriptionOffset: number;
init() {
this.tasksStart = false;
this.tasksEnd = false;
this.descriptionOffset = null;
}
match(tasks: string[], line: string) {
// grunt lists tasks as follows:
// grunt lists tasks as follows (description is wrapped into a new line if too long):
// ...
// Available tasks
// uglify Minify files with UglifyJS. *
// jshint Validate files with JSHint. *
// test Alias for "jshint", "qunit" tasks.
// default Alias for "jshint", "qunit", "concat", "uglify" tasks.
// long Alias for "eslint", "qunit", "browserify", "sass",
// "autoprefixer", "uglify", tasks.
//
// Tasks run in the order specified
if (!this.tasksStart && !this.tasksEnd) {
@ -85,11 +89,16 @@ class GruntTaskMatcher implements TaskDetectorMatcher {
}
}
else if (this.tasksStart && !this.tasksEnd) {
line = line.trim();
if (line.indexOf('Tasks run in the order specified') == 0) {
this.tasksEnd = true;
} else {
tasks.push(line.split(' ')[0]);
if (this.descriptionOffset === null) {
this.descriptionOffset = line.match(/\S \S/).index + 1;
}
let taskName = line.substr(0,this.descriptionOffset).trim();
if (taskName.length > 0) {
tasks.push(taskName);
}
}
}
}
@ -231,7 +240,7 @@ export class ProcessRunnerDetector {
} else if (command === 'jake') {
this._stderr.push(nls.localize('TaskSystemDetector.noJakeProgram', 'Jake is not installed on your system. Run npm install -g jake to install it.'));
} else if (command === 'grunt') {
this._stderr.push(nls.localize('TaskSystemDetector.noJakeProgram', 'Grunt is not installed on your system. Run npm install -g grunt to install it.'));
this._stderr.push(nls.localize('TaskSystemDetector.noGruntProgram', 'Grunt is not installed on your system. Run npm install -g grunt to install it.'));
}
} else {
this._stderr.push(nls.localize('TaskSystemDetector.noProgram', 'Program {0} was not found. Message is {1}', command, error.message));