Update LKG

mhegazy · mhegazy · commit 599b9b0e66d2 · 2016-07-07T12:02:47.000-07:00
diff --git a/lib/tsc.js b/lib/tsc.js
@@ -7235,7 +7235,8 @@ var ts;
         }
         function nextTokenIsClassOrFunctionOrAsync() {
             nextToken();
-            return token === 73 || token === 87 || token === 118;
+            return token === 73 || token === 87 ||
+                (token === 118 && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
         }
         function isListElement(parsingContext, inErrorRecovery) {
             var node = currentNode(parsingContext);
@@ -24050,6 +24051,7 @@ var ts;
                                 var parameter = local_1.valueDeclaration;
                                 if (compilerOptions.noUnusedParameters &&
                                     !ts.isParameterPropertyDeclaration(parameter) &&
+                                    !parameterIsThisKeyword(parameter) &&
                                     !parameterNameStartsWithUnderscore(parameter)) {
                                     error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);
                                 }
@@ -24065,6 +24067,9 @@ var ts;
                 }
             }
         }
+        function parameterIsThisKeyword(parameter) {
+            return parameter.name && parameter.name.originalKeywordKind === 97;
+        }
         function parameterNameStartsWithUnderscore(parameter) {
             return parameter.name && parameter.name.kind === 69 && parameter.name.text.charCodeAt(0) === 95;
         }
diff --git a/lib/tsserver.js b/lib/tsserver.js
@@ -8153,7 +8153,8 @@ var ts;
         }
         function nextTokenIsClassOrFunctionOrAsync() {
             nextToken();
-            return token === 73 || token === 87 || token === 118;
+            return token === 73 || token === 87 ||
+                (token === 118 && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
         }
         function isListElement(parsingContext, inErrorRecovery) {
             var node = currentNode(parsingContext);
@@ -24968,6 +24969,7 @@ var ts;
                                 var parameter = local_1.valueDeclaration;
                                 if (compilerOptions.noUnusedParameters &&
                                     !ts.isParameterPropertyDeclaration(parameter) &&
+                                    !parameterIsThisKeyword(parameter) &&
                                     !parameterNameStartsWithUnderscore(parameter)) {
                                     error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);
                                 }
@@ -24983,6 +24985,9 @@ var ts;
                 }
             }
         }
+        function parameterIsThisKeyword(parameter) {
+            return parameter.name && parameter.name.originalKeywordKind === 97;
+        }
         function parameterNameStartsWithUnderscore(parameter) {
             return parameter.name && parameter.name.kind === 69 && parameter.name.text.charCodeAt(0) === 95;
         }
@@ -50792,7 +50797,6 @@ var ts;
                 if (isOpen === void 0) { isOpen = false; }
                 this.host = host;
                 this.fileName = fileName;
-                this.content = content;
                 this.isOpen = isOpen;
                 this.children = [];
                 this.formatCodeOptions = ts.clone(CompilerService.getDefaultFormatCodeOptions(this.host));
diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts
@@ -8388,7 +8388,6 @@ declare namespace ts.server {
     class ScriptInfo {
         private host;
         fileName: string;
-        content: string;
         isOpen: boolean;
         svc: ScriptVersionCache;
         children: ScriptInfo[];
diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
@@ -8153,7 +8153,8 @@ var ts;
         }
         function nextTokenIsClassOrFunctionOrAsync() {
             nextToken();
-            return token === 73 || token === 87 || token === 118;
+            return token === 73 || token === 87 ||
+                (token === 118 && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
         }
         function isListElement(parsingContext, inErrorRecovery) {
             var node = currentNode(parsingContext);
@@ -24968,6 +24969,7 @@ var ts;
                                 var parameter = local_1.valueDeclaration;
                                 if (compilerOptions.noUnusedParameters &&
                                     !ts.isParameterPropertyDeclaration(parameter) &&
+                                    !parameterIsThisKeyword(parameter) &&
                                     !parameterNameStartsWithUnderscore(parameter)) {
                                     error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);
                                 }
@@ -24983,6 +24985,9 @@ var ts;
                 }
             }
         }
+        function parameterIsThisKeyword(parameter) {
+            return parameter.name && parameter.name.originalKeywordKind === 97;
+        }
         function parameterNameStartsWithUnderscore(parameter) {
             return parameter.name && parameter.name.kind === 69 && parameter.name.text.charCodeAt(0) === 95;
         }
@@ -50792,7 +50797,6 @@ var ts;
                 if (isOpen === void 0) { isOpen = false; }
                 this.host = host;
                 this.fileName = fileName;
-                this.content = content;
                 this.isOpen = isOpen;
                 this.children = [];
                 this.formatCodeOptions = ts.clone(CompilerService.getDefaultFormatCodeOptions(this.host));
diff --git a/lib/typescript.js b/lib/typescript.js
@@ -8988,7 +8988,8 @@ var ts;
         }
         function nextTokenIsClassOrFunctionOrAsync() {
             nextToken();
-            return token === 73 /* ClassKeyword */ || token === 87 /* FunctionKeyword */ || token === 118 /* AsyncKeyword */;
+            return token === 73 /* ClassKeyword */ || token === 87 /* FunctionKeyword */ ||
+                (token === 118 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
         }
         // True if positioned at the start of a list element
         function isListElement(parsingContext, inErrorRecovery) {
@@ -29340,6 +29341,7 @@ var ts;
                                 var parameter = local_1.valueDeclaration;
                                 if (compilerOptions.noUnusedParameters &&
                                     !ts.isParameterPropertyDeclaration(parameter) &&
+                                    !parameterIsThisKeyword(parameter) &&
                                     !parameterNameStartsWithUnderscore(parameter)) {
                                     error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);
                                 }
@@ -29355,6 +29357,9 @@ var ts;
                 }
             }
         }
+        function parameterIsThisKeyword(parameter) {
+            return parameter.name && parameter.name.originalKeywordKind === 97 /* ThisKeyword */;
+        }
         function parameterNameStartsWithUnderscore(parameter) {
             return parameter.name && parameter.name.kind === 69 /* Identifier */ && parameter.name.text.charCodeAt(0) === 95 /* _ */;
         }
diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
@@ -8988,7 +8988,8 @@ var ts;
         }
         function nextTokenIsClassOrFunctionOrAsync() {
             nextToken();
-            return token === 73 /* ClassKeyword */ || token === 87 /* FunctionKeyword */ || token === 118 /* AsyncKeyword */;
+            return token === 73 /* ClassKeyword */ || token === 87 /* FunctionKeyword */ ||
+                (token === 118 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
         }
         // True if positioned at the start of a list element
         function isListElement(parsingContext, inErrorRecovery) {
@@ -29340,6 +29341,7 @@ var ts;
                                 var parameter = local_1.valueDeclaration;
                                 if (compilerOptions.noUnusedParameters &&
                                     !ts.isParameterPropertyDeclaration(parameter) &&
+                                    !parameterIsThisKeyword(parameter) &&
                                     !parameterNameStartsWithUnderscore(parameter)) {
                                     error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);
                                 }
@@ -29355,6 +29357,9 @@ var ts;
                 }
             }
         }
+        function parameterIsThisKeyword(parameter) {
+            return parameter.name && parameter.name.originalKeywordKind === 97 /* ThisKeyword */;
+        }
         function parameterNameStartsWithUnderscore(parameter) {
             return parameter.name && parameter.name.kind === 69 /* Identifier */ && parameter.name.text.charCodeAt(0) === 95 /* _ */;
         }

Original file line number	Diff line number	Diff line change
`@@ -7235,7 +7235,8 @@ var ts;`
`7235`	`7235`	`}`
`7236`	`7236`	`function nextTokenIsClassOrFunctionOrAsync() {`
`7237`	`7237`	`nextToken();`
`7238`		`- return token === 73 \|\| token === 87 \|\| token === 118;`
	`7238`	`+ return token === 73 \|\| token === 87 \|\|`
	`7239`	`+ (token === 118 && lookAhead(nextTokenIsFunctionKeywordOnSameLine));`
`7239`	`7240`	`}`
`7240`	`7241`	`function isListElement(parsingContext, inErrorRecovery) {`
`7241`	`7242`	`var node = currentNode(parsingContext);`
`@@ -24050,6 +24051,7 @@ var ts;`
`24050`	`24051`	`var parameter = local_1.valueDeclaration;`
`24051`	`24052`	`if (compilerOptions.noUnusedParameters &&`
`24052`	`24053`	`!ts.isParameterPropertyDeclaration(parameter) &&`
	`24054`	`+ !parameterIsThisKeyword(parameter) &&`
`24053`	`24055`	`!parameterNameStartsWithUnderscore(parameter)) {`
`24054`	`24056`	`error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);`
`24055`	`24057`	`}`
`@@ -24065,6 +24067,9 @@ var ts;`
`24065`	`24067`	`}`
`24066`	`24068`	`}`
`24067`	`24069`	`}`
	`24070`	`+ function parameterIsThisKeyword(parameter) {`
	`24071`	`+ return parameter.name && parameter.name.originalKeywordKind === 97;`
	`24072`	`+ }`
`24068`	`24073`	`function parameterNameStartsWithUnderscore(parameter) {`
`24069`	`24074`	`return parameter.name && parameter.name.kind === 69 && parameter.name.text.charCodeAt(0) === 95;`
`24070`	`24075`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8153,7 +8153,8 @@ var ts;`
`8153`	`8153`	`}`
`8154`	`8154`	`function nextTokenIsClassOrFunctionOrAsync() {`
`8155`	`8155`	`nextToken();`
`8156`		`- return token === 73 \|\| token === 87 \|\| token === 118;`
	`8156`	`+ return token === 73 \|\| token === 87 \|\|`
	`8157`	`+ (token === 118 && lookAhead(nextTokenIsFunctionKeywordOnSameLine));`
`8157`	`8158`	`}`
`8158`	`8159`	`function isListElement(parsingContext, inErrorRecovery) {`
`8159`	`8160`	`var node = currentNode(parsingContext);`
`@@ -24968,6 +24969,7 @@ var ts;`
`24968`	`24969`	`var parameter = local_1.valueDeclaration;`
`24969`	`24970`	`if (compilerOptions.noUnusedParameters &&`
`24970`	`24971`	`!ts.isParameterPropertyDeclaration(parameter) &&`
	`24972`	`+ !parameterIsThisKeyword(parameter) &&`
`24971`	`24973`	`!parameterNameStartsWithUnderscore(parameter)) {`
`24972`	`24974`	`error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);`
`24973`	`24975`	`}`
`@@ -24983,6 +24985,9 @@ var ts;`
`24983`	`24985`	`}`
`24984`	`24986`	`}`
`24985`	`24987`	`}`
	`24988`	`+ function parameterIsThisKeyword(parameter) {`
	`24989`	`+ return parameter.name && parameter.name.originalKeywordKind === 97;`
	`24990`	`+ }`
`24986`	`24991`	`function parameterNameStartsWithUnderscore(parameter) {`
`24987`	`24992`	`return parameter.name && parameter.name.kind === 69 && parameter.name.text.charCodeAt(0) === 95;`
`24988`	`24993`	`}`
`@@ -50792,7 +50797,6 @@ var ts;`
`50792`	`50797`	`if (isOpen === void 0) { isOpen = false; }`
`50793`	`50798`	`this.host = host;`
`50794`	`50799`	`this.fileName = fileName;`
`50795`		`- this.content = content;`
`50796`	`50800`	`this.isOpen = isOpen;`
`50797`	`50801`	`this.children = [];`
`50798`	`50802`	`this.formatCodeOptions = ts.clone(CompilerService.getDefaultFormatCodeOptions(this.host));`
Original file line number	Diff line number	Diff line change
`@@ -8988,7 +8988,8 @@ var ts;`
`8988`	`8988`	`}`
`8989`	`8989`	`function nextTokenIsClassOrFunctionOrAsync() {`
`8990`	`8990`	`nextToken();`
`8991`		`- return token === 73 /* ClassKeyword / \|\| token === 87 / FunctionKeyword / \|\| token === 118 / AsyncKeyword */;`
	`8991`	`+ return token === 73 /* ClassKeyword / \|\| token === 87 / FunctionKeyword */ \|\|`
	`8992`	`+ (token === 118 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));`
`8992`	`8993`	`}`
`8993`	`8994`	`// True if positioned at the start of a list element`
`8994`	`8995`	`function isListElement(parsingContext, inErrorRecovery) {`
`@@ -29340,6 +29341,7 @@ var ts;`
`29340`	`29341`	`var parameter = local_1.valueDeclaration;`
`29341`	`29342`	`if (compilerOptions.noUnusedParameters &&`
`29342`	`29343`	`!ts.isParameterPropertyDeclaration(parameter) &&`
	`29344`	`+ !parameterIsThisKeyword(parameter) &&`
`29343`	`29345`	`!parameterNameStartsWithUnderscore(parameter)) {`
`29344`	`29346`	`error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);`
`29345`	`29347`	`}`
`@@ -29355,6 +29357,9 @@ var ts;`
`29355`	`29357`	`}`
`29356`	`29358`	`}`
`29357`	`29359`	`}`
	`29360`	`+ function parameterIsThisKeyword(parameter) {`
	`29361`	`+ return parameter.name && parameter.name.originalKeywordKind === 97 /* ThisKeyword */;`
	`29362`	`+ }`
`29358`	`29363`	`function parameterNameStartsWithUnderscore(parameter) {`
`29359`	`29364`	`return parameter.name && parameter.name.kind === 69 /* Identifier / && parameter.name.text.charCodeAt(0) === 95 / _ */;`
`29360`	`29365`	`}`