Implement ALL THE TYPE BUILDERS

weswigham · Jul 26, 2016 · 42e76e8 · 42e76e8
1 parent a32234c
commit 42e76e8
Show file tree

Hide file tree

Showing 6 changed files with 1,628 additions and 44 deletions.
diff --git a/Jakefile.js b/Jakefile.js
@@ -158,7 +158,8 @@ var harnessSources = harnessCoreSources.concat([
     "convertCompilerOptionsFromJson.ts",
     "convertTypingOptionsFromJson.ts",
     "tsserverProjectSystem.ts",
-    "matchFiles.ts"
+    "matchFiles.ts",
+    "typeBuilder.ts",
 ].map(function (f) {
     return path.join(unittestsDirectory, f);
 })).concat([

diff --git a/scripts/tslint/typeOperatorSpacingRule.ts b/scripts/tslint/typeOperatorSpacingRule.ts
@@ -13,15 +13,19 @@ export class Rule extends Lint.Rules.AbstractRule {
 class TypeOperatorSpacingWalker extends Lint.RuleWalker {
     public visitNode(node: ts.Node) {
         if (node.kind === ts.SyntaxKind.UnionType || node.kind === ts.SyntaxKind.IntersectionType) {
-            const types = (<ts.UnionOrIntersectionTypeNode>node).types;
-            let expectedStart = types[0].end + 2; // space, | or &
-            for (let i = 1; i < types.length; i++) {
-                const currentType = types[i];
-                if (expectedStart !== currentType.pos || currentType.getLeadingTriviaWidth() !== 1) {
-                    const failure = this.createFailure(currentType.pos, currentType.getWidth(), Rule.FAILURE_STRING);
-                    this.addFailure(failure);
+            const {line: start} = ts.getLineAndCharacterOfPosition(this.getSourceFile(), node.getStart());
+            const {line: end} = ts.getLineAndCharacterOfPosition(this.getSourceFile(), node.getEnd());
+            if (start === end) {
+                const types = (<ts.UnionOrIntersectionTypeNode>node).types;
+                let expectedStart = types[0].end + 2; // space, | or &
+                for (let i = 1; i < types.length; i++) {
+                    const currentType = types[i];
+                    if (expectedStart !== currentType.pos || currentType.getLeadingTriviaWidth() !== 1) {
+                        const failure = this.createFailure(currentType.pos, currentType.getWidth(), Rule.FAILURE_STRING);
+                        this.addFailure(failure);
+                    }
+                    expectedStart = currentType.end + 2;
                 }
-                expectedStart = currentType.end + 2;
             }
         }
         super.visitNode(node);