Fix compile errors

ajafff · ajafff · commit 6c9ba46e8b92 · 2017-02-19T22:03:32.000+01:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -11546,7 +11546,7 @@ namespace ts {
                 if (isBindingPattern(declaration.parent)) {
                     const parentDeclaration = declaration.parent.parent;
                     const name = declaration.propertyName || declaration.name;
-                    if (isVariableLike(parentDeclaration) &&
+                    if (parentDeclaration.kind !== SyntaxKind.BindingElement &&
                         parentDeclaration.type &&
                         !isBindingPattern(name)) {
                         const text = getTextOfPropertyName(name);
diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
@@ -370,8 +370,8 @@ namespace ts.BreakpointResolver {
             }
 
             function textSpanFromVariableDeclaration(variableDeclaration: VariableDeclaration): TextSpan {
-                const declarations = variableDeclaration.parent.declarations;
-                if (declarations && declarations[0] === variableDeclaration) {
+                if (variableDeclaration.parent.kind === SyntaxKind.VariableDeclarationList &&
+                    variableDeclaration.parent.declarations[0] === variableDeclaration) {
                     // First declaration - include let keyword
                     return textSpan(findPrecedingToken(variableDeclaration.pos, sourceFile, variableDeclaration.parent), variableDeclaration);
                 }
@@ -400,8 +400,8 @@ namespace ts.BreakpointResolver {
                     return textSpanFromVariableDeclaration(variableDeclaration);
                 }
 
-                const declarations = variableDeclaration.parent.declarations;
-                if (declarations && declarations[0] !== variableDeclaration) {
+                if (variableDeclaration.parent.kind === SyntaxKind.VariableDeclarationList &&
+                    variableDeclaration.parent.declarations[0] !== variableDeclaration) {
                     // If we cannot set breakpoint on this declaration, set it on previous one
                     // Because the variable declaration may be binding pattern and
                     // we would like to set breakpoint in last binding element if that's the case,

Original file line number	Diff line number	Diff line change
`@@ -370,8 +370,8 @@ namespace ts.BreakpointResolver {`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`function textSpanFromVariableDeclaration(variableDeclaration: VariableDeclaration): TextSpan {`
`373`		`- const declarations = variableDeclaration.parent.declarations;`
`374`		`- if (declarations && declarations[0] === variableDeclaration) {`
	`373`	`+ if (variableDeclaration.parent.kind === SyntaxKind.VariableDeclarationList &&`
	`374`	`+ variableDeclaration.parent.declarations[0] === variableDeclaration) {`
`375`	`375`	`// First declaration - include let keyword`
`376`	`376`	`return textSpan(findPrecedingToken(variableDeclaration.pos, sourceFile, variableDeclaration.parent), variableDeclaration);`
`377`	`377`	`}`
`@@ -400,8 +400,8 @@ namespace ts.BreakpointResolver {`
`400`	`400`	`return textSpanFromVariableDeclaration(variableDeclaration);`
`401`	`401`	`}`
`402`	`402`
`403`		`- const declarations = variableDeclaration.parent.declarations;`
`404`		`- if (declarations && declarations[0] !== variableDeclaration) {`
	`403`	`+ if (variableDeclaration.parent.kind === SyntaxKind.VariableDeclarationList &&`
	`404`	`+ variableDeclaration.parent.declarations[0] !== variableDeclaration) {`
`405`	`405`	`// If we cannot set breakpoint on this declaration, set it on previous one`
`406`	`406`	`// Because the variable declaration may be binding pattern and`
`407`	`407`	`// we would like to set breakpoint in last binding element if that's the case,`