Merge pull request microsoft#2756 from Microsoft/completionFixes

mhegazy · mhegazy · commit fe509572409f · 2015-04-14T10:18:05.000-07:00
Completion fixes
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -9412,7 +9412,10 @@ module ts {
             }
             
             if (isArrayLikeType(inputType)) {
-                return getIndexTypeOfType(inputType, IndexKind.Number);
+                let indexType = getIndexTypeOfType(inputType, IndexKind.Number);
+                if (indexType) {
+                    return indexType;
+                }
             }
 
             error(errorNode, Diagnostics.Type_0_is_not_an_array_type, typeToString(inputType));
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -3109,6 +3109,7 @@ module ts {
 
                         case SyntaxKind.SemicolonToken:
                             return containingNodeKind === SyntaxKind.PropertySignature &&
+                                previousToken.parent && previousToken.parent.parent &&
                                 (previousToken.parent.parent.kind === SyntaxKind.InterfaceDeclaration ||    // interface a { f; |
                                     previousToken.parent.parent.kind === SyntaxKind.TypeLiteral);           //  let x : { a; |
 
@@ -3124,7 +3125,8 @@ module ts {
                         case SyntaxKind.DotDotDotToken:
                             return containingNodeKind === SyntaxKind.Parameter ||
                                 containingNodeKind === SyntaxKind.Constructor ||
-                                (previousToken.parent.parent.kind === SyntaxKind.ArrayBindingPattern);  // var [ ...z|
+                                (previousToken.parent && previousToken.parent.parent &&
+                                    previousToken.parent.parent.kind === SyntaxKind.ArrayBindingPattern);  // var [ ...z|
 
                         case SyntaxKind.PublicKeyword:
                         case SyntaxKind.PrivateKeyword:
diff --git a/tests/baselines/reference/assignmentLHSIsValue.errors.txt b/tests/baselines/reference/assignmentLHSIsValue.errors.txt
@@ -14,6 +14,7 @@ tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(3
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(31,1): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(32,1): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(35,9): error TS1128: Declaration or statement expected.
+tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(38,1): error TS2461: Type 'any' is not an array type.
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(38,2): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(38,6): error TS2364: Invalid left-hand side of assignment expression.
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(42,36): error TS1034: 'super' must be followed by an argument list or member access.
@@ -38,7 +39,7 @@ tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(6
 tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(70,1): error TS2364: Invalid left-hand side of assignment expression.
 
 
-==== tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts (38 errors) ====
+==== tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts (39 errors) ====
     // expected error for all the LHS of assignments
     var value;
     
@@ -109,6 +110,8 @@ tests/cases/conformance/expressions/assignmentOperator/assignmentLHSIsValue.ts(7
     
     // array literals
     ['', ''] = value;
+    ~~~~~~~~
+!!! error TS2461: Type 'any' is not an array type.
      ~~
 !!! error TS2364: Invalid left-hand side of assignment expression.
          ~~
diff --git a/tests/cases/fourslash/completionAfterDotDotDot.ts b/tests/cases/fourslash/completionAfterDotDotDot.ts
@@ -0,0 +1,6 @@
+/// <reference path='fourslash.ts'/>
+
+////.../**/
+
+goTo.marker();
+verify.not.completionListIsEmpty();
diff --git a/tests/cases/fourslash/completionInIncompleteCallExpression.ts b/tests/cases/fourslash/completionInIncompleteCallExpression.ts
@@ -0,0 +1,9 @@
+/// <reference path='fourslash.ts'/>
+
+////var array = [1, 2, 4]
+////function a4(x, y, z) { }
+////a4(...<crash>/**/
+    
+
+goTo.marker();
+verify.not.completionListIsEmpty();

Original file line number	Diff line number	Diff line change
`@@ -9412,7 +9412,10 @@ module ts {`
`9412`	`9412`	`}`
`9413`	`9413`
`9414`	`9414`	`if (isArrayLikeType(inputType)) {`
`9415`		`- return getIndexTypeOfType(inputType, IndexKind.Number);`
	`9415`	`+ let indexType = getIndexTypeOfType(inputType, IndexKind.Number);`
	`9416`	`+ if (indexType) {`
	`9417`	`+ return indexType;`
	`9418`	`+ }`
`9416`	`9419`	`}`
`9417`	`9420`
`9418`	`9421`	`error(errorNode, Diagnostics.Type_0_is_not_an_array_type, typeToString(inputType));`