Update LKG.

microsoft · Sep 26, 2018 · f4a643f · f4a643f
1 parent 53105b3
commit f4a643f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/lib/tsc.js b/lib/tsc.js
@@ -25919,7 +25919,7 @@ var ts;
         }
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 || result.flags & 32 || result.flags & 384));
-            var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 241) ? d : undefined; });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 241) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {

diff --git a/lib/tsserver.js b/lib/tsserver.js
@@ -31759,7 +31759,7 @@ var ts;
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
             // Block-scoped variables cannot be used before their definition
-            var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 241 /* EnumDeclaration */) ? d : undefined; });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 241 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {

diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js
@@ -31755,7 +31755,7 @@ var ts;
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
             // Block-scoped variables cannot be used before their definition
-            var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 241 /* EnumDeclaration */) ? d : undefined; });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 241 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {

diff --git a/lib/typescript.js b/lib/typescript.js
@@ -31746,7 +31746,7 @@ var ts;
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
             // Block-scoped variables cannot be used before their definition
-            var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 241 /* EnumDeclaration */) ? d : undefined; });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 241 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {

diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js
@@ -31746,7 +31746,7 @@ var ts;
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
             // Block-scoped variables cannot be used before their definition
-            var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 241 /* EnumDeclaration */) ? d : undefined; });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 241 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {

diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
@@ -31759,7 +31759,7 @@ var ts;
         function checkResolvedBlockScopedVariable(result, errorLocation) {
             ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
             // Block-scoped variables cannot be used before their definition
-            var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 241 /* EnumDeclaration */) ? d : undefined; });
+            var declaration = ts.find(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 241 /* EnumDeclaration */) || ts.isInJSFile(d) && !!ts.getJSDocEnumTag(d); });
             if (declaration === undefined)
                 return ts.Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
             if (!(declaration.flags & 4194304 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {