pref: make linter asyc

refs #27

Author: basarat

lib/linter.js

@@ -1,5 +1,4 @@
-var programManager = require('./main/lang/programManager');
-var utils = require('./main/lang/utils');
+var parent = require('./worker/parent');
 var fs = require('fs');
 var linterPath = atom.packages.getLoadedPackage("linter").path;
 var Linter = require(linterPath + "/lib/linter");
@@ -18,9 +17,6 @@ var LinterTslint, __hasProp = {}.hasOwnProperty, __extends = function (child, pa
     child.__super__ = parent.prototype;
     return child;
 };
-var debouncedErrors = utils.debounce(function (callback, errors) {
-    callback(errors);
-}, 1500);
 LinterTslint = (function (_super) {
     __extends(LinterTslint, _super);
     function LinterTslint() {
@@ -31,15 +27,16 @@ LinterTslint = (function (_super) {
         if (!this.editor.buffer.file || !this.editor.buffer.file.path || !fs.existsSync(this.editor.buffer.file.path))
             return callback([]);
         filePath = this.editor.buffer.file.path;
-        var errors = programManager.getErrorsForFileFiltered(filePath);
-        var linterErrors = errors.map(function (err) { return {
-            message: err.message,
-            line: err.startPos.line + 1,
-            range: new Rng([err.startPos.line, err.startPos.ch], [err.endPos.line, err.endPos.ch]),
-            level: 'error',
-            linter: 'TypeScript'
-        }; });
-        return callback(linterErrors);
+        parent.getErrorsForFile({ filePath: filePath }).then(function (resp) {
+            var linterErrors = resp.errors.map(function (err) { return {
+                message: err.message,
+                line: err.startPos.line + 1,
+                range: new Rng([err.startPos.line, err.startPos.ch], [err.endPos.line, err.endPos.ch]),
+                level: 'error',
+                linter: 'TypeScript'
+            }; });
+            return callback(linterErrors);
+        });
     };
     return LinterTslint;
 })(Linter);

lib/linter.ts

@@ -8,6 +8,8 @@
 import programManager = require('./main/lang/programManager'); ///ts:import:generated
 ///ts:import=utils
 import utils = require('./main/lang/utils'); ///ts:import:generated
+///ts:import=parent
+import parent = require('./worker/parent'); ///ts:import:generated
 
 import fs = require('fs');
 
@@ -28,10 +30,6 @@ interface LinterError {
     linter: string; // linter name
 }
 
-var debouncedErrors = utils.debounce((callback: Function, errors: LinterError[]) => {
-    callback(errors);
-}, 1500);
-
 LinterTslint = (function(_super) {
     __extends(LinterTslint, _super);
 
@@ -41,25 +39,25 @@ LinterTslint = (function(_super) {
 
     (<any>LinterTslint).syntax = ['source.ts'];
 
-    LinterTslint.prototype.lintFile = function(filePath, callback: (errors: LinterError[]) => any) {
+    LinterTslint.prototype.lintFile = function(filePath:string, callback: (errors: LinterError[]) => any) {
         // We refuse to work on files that are not on disk.
         if (!this.editor.buffer.file
             || !this.editor.buffer.file.path
             || !fs.existsSync(this.editor.buffer.file.path)) return callback([]);
 
         filePath = this.editor.buffer.file.path;
 
-        var errors = programManager.getErrorsForFileFiltered(filePath);
-        var linterErrors: LinterError[] = errors.map((err) => <LinterError>{
-            message: err.message,
-            line: err.startPos.line + 1,
-            range: new Rng([err.startPos.line, err.startPos.ch], [err.endPos.line, err.endPos.ch]),
-            level: 'error',
-            linter: 'TypeScript'
-        });
+        parent.getErrorsForFile({ filePath: filePath }).then((resp) => {
+            var linterErrors: LinterError[] = resp.errors.map((err) => <LinterError>{
+                message: err.message,
+                line: err.startPos.line + 1,
+                range: new Rng([err.startPos.line, err.startPos.ch], [err.endPos.line, err.endPos.ch]),
+                level: 'error',
+                linter: 'TypeScript'
+            });
 
-        return callback(linterErrors);
-        // return debouncedErrors(callback, linterErrors);
+            return callback(linterErrors);
+        });
     };
 
     return LinterTslint;

lib/worker/messages.js

@@ -41,3 +41,4 @@ exports.echo = 'echo';
 exports.updateText = 'updateText';
 exports.getErrorsForFile = 'getErrorsForFile';
 exports.getCompletionsAtPosition = 'getCompletionsAtPosition';
+exports.getErrorsForFileFiltered = 'getErrorsForFileFiltered';

lib/worker/messages.ts

@@ -99,3 +99,11 @@ export interface GetCompletionsAtPositionQuery {
 export interface GetCompletionsAtPositionResponse {
     completions: programManager.Completion[];
 }
+
+export var getErrorsForFileFiltered = 'getErrorsForFileFiltered';
+export interface GetErrorsForFileFilteredQuery{
+    filePath:string;
+}
+export interface GetErrorsForFileFilteredResponse{
+    errors: programManager.TSError[];
+}

lib/worker/parent.js

@@ -102,3 +102,4 @@ exports.echo = function (data) { return query(messages.echo, data); };
 exports.updateText = function (data) { return query(messages.updateText, data); };
 exports.getErrorsForFile = function (data) { return query(messages.getErrorsForFile, data); };
 exports.getCompletionsAtPosition = function (data) { return query(messages.getCompletionsAtPosition, data); };
+exports.getErrorsForFileFiltered = function (data) { return query(messages.getErrorsForFileFiltered, data); };

lib/worker/parent.ts

@@ -145,3 +145,6 @@ export var getErrorsForFile: Exec<messages.GetErrorsForFileQuery, messages.GetEr
 
 export var getCompletionsAtPosition: Exec<messages.GetCompletionsAtPositionQuery, messages.GetCompletionsAtPositionResponse>
     = (data) => query(messages.getCompletionsAtPosition, data);
+
+export var getErrorsForFileFiltered: Exec<messages.GetErrorsForFileFilteredQuery, messages.GetErrorsForFileFilteredResponse>
+    = (data) => query(messages.getErrorsForFileFiltered, data);

lib/worker/workerProcess.js

@@ -42,3 +42,8 @@ responders[messages.getCompletionsAtPosition] = function (data) {
         completions: programManager.getCompletionsAtPosition(data.filePath, data.position, data.prefix)
     };
 };
+responders[messages.getErrorsForFileFiltered] = function (data) {
+    return {
+        errors: programManager.getErrorsForFileFiltered(data.filePath)
+    };
+};

lib/worker/workerProcess.ts

@@ -61,3 +61,9 @@ responders[messages.getCompletionsAtPosition] = (data: messages.GetCompletionsAt
         completions: programManager.getCompletionsAtPosition(data.filePath,data.position,data.prefix)
     };
 }
+
+responders[messages.getErrorsForFileFiltered] = (data: messages.GetErrorsForFileFilteredQuery): messages.GetErrorsForFileFilteredResponse => {
+    return {
+        errors: programManager.getErrorsForFileFiltered(data.filePath)
+    };
+}