Fix flake8 linting

tht13 · tht13 · commit fc11f8d21306 · 2016-02-07T11:50:16.000+01:00
diff --git a/src/server/src/linter/flake8.ts b/src/server/src/linter/flake8.ts
@@ -29,23 +29,23 @@ export class Flake8 extends BaseLinter {
         // destructuring not yet supported in vscode
         // must be done manually
         {
+            //TODO: parse null better
             let match = lint.match(this.getRegExp());
+            if (match == null) {
+                this.warn("unparsed line:");
+                this.warn(lint);
+                return;
+            }
             matchProperties = {
                 completeMatch: match[0],
                 filepath: match[1],
                 line: parseInt(match[2]) - 1,
-                column: parseInt(match[3]),
+                column: parseInt(match[3]) - 1,
                 severityKey: match[4],
                 message: match[5]
             };
         }
 
-        if (matchProperties.completeMatch == null) {
-            this.warn("unparsed line:");
-            this.warn(lint);
-            return;
-        }
-
         let severity = this._severityMap.has(matchProperties.severityKey.substring(0, 1))
             ? this._severityMap.get(matchProperties.severityKey.substring(0, 1))
             : DiagnosticSeverity.Error;
diff --git a/src/server/src/server.ts b/src/server/src/server.ts
@@ -137,7 +137,6 @@ function validateTextDocument(textDocument: ITextDocument): void {
     linter.setDocument(textDocument);
     let cmd: string = linter.getCmd();
 
-    //TODO: Flake8 outputs to stderr, need to determine output buffer to parse
     exec(cmd, function(error: Error, stdout: ArrayBuffer, stderr: ArrayBuffer) {
         if (error.toString().length !== 0) {
             connection.console.warn(`[ERROR] File: ${linter.getFilepath()} - Error message: ${error.toString()}`);
@@ -147,7 +146,7 @@ function validateTextDocument(textDocument: ITextDocument): void {
         let results: string[] = stdout.toString().split(/\r?\n/g);
         results = linter.fixResults(results);
         
-        // log error messages
+        // process linter output
         let diagnostics: Diagnostic[] = [];
         for (let result of results) {
             let diagnostic = linter.parseLintResult(result);
