Tweaked some of the tslint rules.

rokucommunity · Dec 11, 2018 · 3ea386f · 3ea386f
1 parent 0b96ac0
commit 3ea386f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/src/DefinitionRepository.ts b/src/DefinitionRepository.ts
@@ -95,7 +95,7 @@ export class DefinitionRepository {
         let result = yield* this.findDefinitionForWord(document, position, word);
         return result;
     }
-        // duplicating some of thisactivate.olympicchanel.com to reduce the risk of introducing nasty performance issues/unwanted behaviour by extending Location
+    // duplicating some of thisactivate.olympicchanel.com to reduce the risk of introducing nasty performance issues/unwanted behaviour by extending Location
     public * findDefinitionForWord(document: TextDocument, position: Position, word: string): IterableIterator<BrightScriptDeclaration> {
 
         this.sync();

diff --git a/src/XmlUtils.ts b/src/XmlUtils.ts
@@ -1,11 +1,12 @@
-import { CancellationToken,
+import {
+    CancellationToken,
     Position,
     Range,
     TextDocument
 } from 'vscode';
 
 export enum XmlWordType {
-    Illegal= -1,
+    Illegal = -1,
     Tag = 0,
     AttributeValue = 1,
     Attribute = 2,
@@ -36,7 +37,7 @@ export class XmlUtils {
                 return this.getTextWithOffsets(document, position);
                 break;
             case XmlWordType.AttributeValue:
-                return this.getTextWithOffsets(document, position,  /[^\s\"]+/);
+                return this.getTextWithOffsets(document, position, /[^\s\"]+/);
                 break;
         }
     }
@@ -51,7 +52,7 @@ export class XmlUtils {
 
     // Check if the cursor is about complete the value of an attribute.
     private isAttributeValue(document: TextDocument, position: Position): boolean {
-        let wordRange = document.getWordRangeAtPosition(position,  /[^\s\"\']+/);
+        let wordRange = document.getWordRangeAtPosition(position, /[^\s\"\']+/);
         let wordStart = wordRange ? wordRange.start : position;
         let wordEnd = wordRange ? wordRange.end : position;
         if (wordStart.character === 0 || wordEnd.character > document.lineAt(wordEnd.line).text.length - 1) {
@@ -84,10 +85,10 @@ export class XmlUtils {
     }
 
     private getTextWithOffsets(document: TextDocument, position: Position, wordRegex?) {
-        let wordRange = document.getWordRangeAtPosition(position,  wordRegex);
+        let wordRange = document.getWordRangeAtPosition(position, wordRegex);
         let wordStart = wordRange ? wordRange.start : position;
         return document.getText(
             new Range(new Position(wordStart.line, wordStart.character),
-            new Position(wordRange.end.line, wordRange.end.character)));
+                new Position(wordRange.end.line, wordRange.end.character)));
     }
 }
diff --git a/src/extension.spec.ts b/src/extension.spec.ts
@@ -15,9 +15,9 @@ Module.prototype.require = function hijacked(file) {
     if (file === 'vscode') {
         return vscode;
     } else if (file === './BrightScriptCommands') {
-        let command = { registerCommands: () => {} };
+        let command = { registerCommands: () => { } };
         commandsMock = sinon.mock(command);
-        return { getBrightScriptCommandsInstance : () => command };
+        return { getBrightScriptCommandsInstance: () => command };
     } else {
         return oldRequire.apply(this, arguments);
     }

diff --git a/src/mockVscode.spec.ts b/src/mockVscode.spec.ts
@@ -52,8 +52,8 @@ export let vscode = {
                 show: () => { }
             };
         },
-        activeTextEditor : {
-            document : undefined
+        activeTextEditor: {
+            document: undefined
         }
     },
     CompletionItemKind: {

diff --git a/src/tslint.json b/src/tslint.json
@@ -54,6 +54,7 @@
         "no-duplicate-variable": true,
         "no-empty": false,
         "no-shadowed-variable": false,
+        "no-trailing-whitespace": true,
         "no-unused-expression": true,
         "no-var-keyword": true,
         "object-curly-spacing": true,
@@ -77,13 +78,16 @@
             true,
             "always"
         ],
+        "ter-arrow-spacing": true,
         "ter-indent": [
             true,
             4,
             {
                 "SwitchCase": 1
             }
         ],
+        "ter-no-irregular-whitespace": true,
+        "ter-no-mixed-spaces-and-tabs": true,
         "trailing-comma": [
             true,
             "never"