fix linter errors

Author: krvajal

.travis.yml

@@ -14,7 +14,7 @@ before_install:
     fi
 
 install:
-  - TRAVIS_NODE_VERSION="6";
+  - TRAVIS_NODE_VERSION="7";
       # Clear out whatever version of NVM Travis has as it is old.
   - rm -rf ~/.nvm;
       # Grab NVM.
@@ -23,8 +23,8 @@ install:
       # Note that you can just hardcode a preferred version here.
   - (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`);
       # Install the desired version of Node
-  -  source ~/.nvm/nvm.sh;
-  -  nvm install $TRAVIS_NODE_VERSION;
+  - source ~/.nvm/nvm.sh;
+  - nvm install $TRAVIS_NODE_VERSION;
   - npm install
   - npm run vscode:prepublish
 

src/extension.ts

@@ -2,25 +2,24 @@
 import * as vscode from 'vscode';
 
 import FortranLintingProvider from './features/linter-provider';
-import FortranHoverProvider from "./features/hover-provider";
-import { FortranCompletionProvider } from "./features/completion-provider";
-import { FortranDocumentSymbolProvider } from "./features/document-symbol-provider";
+import FortranHoverProvider from './features/hover-provider';
+import { FortranCompletionProvider } from './features/completion-provider';
+import { FortranDocumentSymbolProvider } from './features/document-symbol-provider';
 
 export function activate(context: vscode.ExtensionContext) {
 
     let hoverProvider = new FortranHoverProvider();
     let completionProvider = new FortranCompletionProvider();
     let symbolProvider = new FortranDocumentSymbolProvider();
 
-    if (vscode.workspace.getConfiguration("fortran").get("linterEnabled", true)) {
+    if (vscode.workspace.getConfiguration('fortran').get('linterEnabled', true)) {
 
         let linter = new FortranLintingProvider();
         linter.activate(context.subscriptions);
         vscode.languages.registerCodeActionsProvider('fortran90', linter);
     }
 
-    vscode.languages.registerCompletionItemProvider("fortran90", completionProvider)
+    vscode.languages.registerCompletionItemProvider('fortran90', completionProvider);
     vscode.languages.registerHoverProvider('fortran90', hoverProvider);
-    vscode.languages.registerDocumentSymbolProvider("fortran90", symbolProvider);
-
+    vscode.languages.registerDocumentSymbolProvider('fortran90', symbolProvider);
 }

src/lib/tokenizer.ts

@@ -0,0 +1,60 @@
+
+
+
+export enum TokenType {
+    FUNCTION,
+    SUBROUTINE,
+    NUMBER,
+    VARIABLE,
+    END,
+    DO,
+    IF,
+    LEFT_PARENTESIS,
+    RIGHT_PARENTESIS,
+    COMMA,
+    BINARY_OPERATOR
+}
+
+
+export interface TokenInfo {
+
+    pattern: RegExp;
+    token: TokenType;
+
+}
+export interface Token {
+    token: TokenType;
+    sequence: string;
+
+}
+export class Tokenizer {
+    
+    tokenInfos: TokenInfo[];
+    public tokens: Token[];
+    constructor(){
+        this.tokenInfos = [];
+        this.tokens = [];
+    }
+    public add(regex, token){
+        this.tokenInfos.push({pattern:regex, token: token});
+    }
+    public tokenize(expression:string){
+        this.tokens = [];
+        while(expression !== ''){
+            let match = false;
+            for(let i = 0; i < this.tokenInfos.length; i++){
+                let info = this.tokenInfos[i];
+                let result = info.pattern.exec(expression);
+                console.log(expression);
+                if(result && result.length > 0){
+                    match = true;
+                    this.tokens.push({token: info.token, sequence: result[0].trim()});
+                    expression = expression.replace(info.pattern,"");
+                    break;
+                }
+            }
+        }
+
+    }
+
+}

test/extension.test.ts

@@ -14,17 +14,14 @@ import * as vscode from 'vscode';
 import * as myExtension from '../src/extension';
 
 // Defines a Mocha test suite to group tests of similar kind together
-suite("Extension Tests", () => {
+suite('Extension Tests', () => {
 
     // Defines a Mocha unit test
-    test("Something 1", () => {
+    test('Something 1', () => {
         assert.equal(-1, [1, 2, 3].indexOf(5));
         assert.equal(-1, [1, 2, 3].indexOf(0));
     });
 
-    
-
-   
 });
 
 

test/helper.test.ts

@@ -13,34 +13,43 @@ suite("function helper test", () => {
     test("validVariableName does not allow variables starting with number", () => {
         assert.equal(false, validVariableName("1as"));
     });
+
     test("validVariableName returns true  with correct variable", () => {
         assert.equal(true, validVariableName("matA"));
     });
+
     test("validVariableName returns true for variables starting with uppercase", () => {
         assert.equal(true, validVariableName("MatA"));
     });
+
     test("validVariableName return true for variable starting with _", () => {
         assert.equal(true, validVariableName("_matA"));
     });
+
     test("parseFuntion return undefined on empty line", () => {
         assert.equal(undefined, parseFunction(""));
     });
+
     test("parseFuntion return undefined if function keyword is missing", () => {
         assert.equal(undefined, parseFunction("hello"));
     });
+
     test("parseFuntion return correct function name", () => {
         assert.equal("hello", parseFunction("function hello()").name);
     });
 
     test("parseFuntion return correct number of args", () => {
         assert.equal(2, parseFunction("function hello( a, b)").args.length);
     });
+
     test("parseArgs return the correct number of args", () => {
         assert.equal(2, parseArgs("a,b").length);
-    })
+    });
+
     test("parseArgs handle spaces well", () => {
         assert.equal(2, parseArgs(" a, b").length);
     });
+
     test("parseArgs handle empty args", () => {
         assert.equal(0, parseArgs("").length);
     });

test/index.ts

@@ -10,7 +10,7 @@
 // to report the results back to the caller. When the tests are finished, return
 // a possible error to the callback or null if none.
 
-var testRunner = require('vscode/lib/testrunner');
+let testRunner = require('vscode/lib/testrunner');
 
 // You can directly control Mocha options by uncommenting the following lines
 // See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info

test/tokenizer.test.ts

@@ -0,0 +1,27 @@
+
+// The module 'assert' provides assertion methods from node
+import * as assert from 'assert';
+import * as fs from 'fs';
+import { Tokenizer, TokenType } from '../src/lib/tokenizer';
+
+suite("function helper test", () => {
+
+    test("sample test", () => {
+        let tokenizer = new Tokenizer();
+        tokenizer.add(/^function\s*/,  TokenType.FUNCTION );
+        tokenizer.add(/^subroutine\s*/, TokenType.SUBROUTINE );
+        tokenizer.add(/^if\s*/, TokenType.IF);
+        tokenizer.add(/^do\s*/, TokenType.DO);
+        tokenizer.add(/^end\s*/, TokenType.END );
+        tokenizer.add(/^[0-9]+\s*/, TokenType.NUMBER); // number
+        tokenizer.add(/^[a-zA-Z_]+[a-zA-Z0-9_]*\s*/, TokenType.VARIABLE ); // variable
+        tokenizer.add(/^\(\s*/, TokenType.LEFT_PARENTESIS); // left parentesis
+        tokenizer.add(/^\)\s*/, TokenType.RIGHT_PARENTESIS); // right parentesis
+        tokenizer.add(/^,\s*/, TokenType.COMMA); // right parentesis
+        tokenizer.add(/[+\-*\/]\s*/, TokenType.BINARY_OPERATOR); // right parentesis
+
+        tokenizer.tokenize("function a( m, a10)\n 2 + 3\nend");
+        let tokens = tokenizer.tokens;
+        console.log(tokens);
+    });
+});