Skip to content

Commit 80bca64

Browse files
mhegazymhegazy
committed
Update LKG
1 parent f0aa3b8 commit 80bca64

10 files changed

+3528
-643
lines changed

‎lib/protocol.d.ts

+1,700
Large diffs are not rendered by default.

‎lib/tsc.js

+37-29
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ var ts;
125125
var ts;
126126
(function (ts) {
127127
var createObject = Object.create;
128+
ts.collator = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator() : undefined;
128129
function createMap(template) {
129130
var map = createObject(null);
130131
map["__"] = undefined;
@@ -682,7 +683,7 @@ var ts;
682683
if (b === undefined)
683684
return 1;
684685
if (ignoreCase) {
685-
if (String.prototype.localeCompare) {
686+
if (ts.collator && String.prototype.localeCompare) {
686687
var result = a.localeCompare(b, undefined, { usage: "sort", sensitivity: "accent" });
687688
return result < 0 ? -1 : result > 0 ? 1 : 0;
688689
}
@@ -1710,6 +1711,9 @@ var ts;
17101711
},
17111712
watchDirectory: function (directoryName, callback, recursive) {
17121713
var options;
1714+
if (!directoryExists(directoryName)) {
1715+
return;
1716+
}
17131717
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
17141718
options = { persistent: true, recursive: !!recursive };
17151719
}
@@ -14986,14 +14990,14 @@ var ts;
1498614990
}
1498714991
return false;
1498814992
}
14989-
function isSymbolAccessible(symbol, enclosingDeclaration, meaning) {
14993+
function isSymbolAccessible(symbol, enclosingDeclaration, meaning, shouldComputeAliasesToMakeVisible) {
1499014994
if (symbol && enclosingDeclaration && !(symbol.flags & 262144)) {
1499114995
var initialSymbol = symbol;
1499214996
var meaningToLook = meaning;
1499314997
while (symbol) {
1499414998
var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaningToLook, false);
1499514999
if (accessibleSymbolChain) {
14996-
var hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0]);
15000+
var hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0], shouldComputeAliasesToMakeVisible);
1499715001
if (!hasAccessibleDeclarations) {
1499815002
return {
1499915003
accessibility: 1,
@@ -15034,7 +15038,7 @@ var ts;
1503415038
function hasExternalModuleSymbol(declaration) {
1503515039
return ts.isAmbientModule(declaration) || (declaration.kind === 256 && ts.isExternalOrCommonJsModule(declaration));
1503615040
}
15037-
function hasVisibleDeclarations(symbol) {
15041+
function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
1503815042
var aliasesToMakeVisible;
1503915043
if (ts.forEach(symbol.declarations, function (declaration) { return !getIsDeclarationVisible(declaration); })) {
1504015044
return undefined;
@@ -15046,14 +15050,16 @@ var ts;
1504615050
if (anyImportSyntax &&
1504715051
!(anyImportSyntax.flags & 1) &&
1504815052
isDeclarationVisible(anyImportSyntax.parent)) {
15049-
getNodeLinks(declaration).isVisible = true;
15050-
if (aliasesToMakeVisible) {
15051-
if (!ts.contains(aliasesToMakeVisible, anyImportSyntax)) {
15052-
aliasesToMakeVisible.push(anyImportSyntax);
15053+
if (shouldComputeAliasToMakeVisible) {
15054+
getNodeLinks(declaration).isVisible = true;
15055+
if (aliasesToMakeVisible) {
15056+
if (!ts.contains(aliasesToMakeVisible, anyImportSyntax)) {
15057+
aliasesToMakeVisible.push(anyImportSyntax);
15058+
}
15059+
}
15060+
else {
15061+
aliasesToMakeVisible = [anyImportSyntax];
1505315062
}
15054-
}
15055-
else {
15056-
aliasesToMakeVisible = [anyImportSyntax];
1505715063
}
1505815064
return true;
1505915065
}
@@ -15076,7 +15082,7 @@ var ts;
1507615082
}
1507715083
var firstIdentifier = getFirstIdentifier(entityName);
1507815084
var symbol = resolveName(enclosingDeclaration, firstIdentifier.text, meaning, undefined, undefined);
15079-
return (symbol && hasVisibleDeclarations(symbol)) || {
15085+
return (symbol && hasVisibleDeclarations(symbol, true)) || {
1508015086
accessibility: 1,
1508115087
errorSymbolName: ts.getTextOfNode(firstIdentifier),
1508215088
errorNode: firstIdentifier
@@ -15293,14 +15299,10 @@ var ts;
1529315299
else if (type.flags & (32768 | 65536 | 16 | 16384)) {
1529415300
buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064, 0, nextFlags);
1529515301
}
15296-
else if (!(flags & 512) && type.flags & (2097152 | 1572864) && type.aliasSymbol) {
15297-
if (type.flags & 2097152 || !(flags & 1024)) {
15298-
var typeArguments = type.aliasTypeArguments;
15299-
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
15300-
}
15301-
else {
15302-
writeUnionOrIntersectionType(type, nextFlags);
15303-
}
15302+
else if (!(flags & 512) && ((type.flags & 2097152 && !type.target) || type.flags & 1572864) && type.aliasSymbol &&
15303+
isSymbolAccessible(type.aliasSymbol, enclosingDeclaration, 793064, false).accessibility === 0) {
15304+
var typeArguments = type.aliasTypeArguments;
15305+
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
1530415306
}
1530515307
else if (type.flags & 1572864) {
1530615308
writeUnionOrIntersectionType(type, nextFlags);
@@ -29589,7 +29591,7 @@ var ts;
2958929591
}
2959029592
}
2959129593
function trackSymbol(symbol, enclosingDeclaration, meaning) {
29592-
handleSymbolAccessibilityError(resolver.isSymbolAccessible(symbol, enclosingDeclaration, meaning));
29594+
handleSymbolAccessibilityError(resolver.isSymbolAccessible(symbol, enclosingDeclaration, meaning, true));
2959329595
recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForSymbol(symbol, meaning));
2959429596
}
2959529597
function reportInaccessibleThisError() {
@@ -29606,7 +29608,7 @@ var ts;
2960629608
}
2960729609
else {
2960829610
errorNameNode = declaration.name;
29609-
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 | 1024, writer);
29611+
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2, writer);
2961029612
errorNameNode = undefined;
2961129613
}
2961229614
}
@@ -29618,7 +29620,7 @@ var ts;
2961829620
}
2961929621
else {
2962029622
errorNameNode = signature.name;
29621-
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 | 1024, writer);
29623+
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2, writer);
2962229624
errorNameNode = undefined;
2962329625
}
2962429626
}
@@ -29811,7 +29813,7 @@ var ts;
2981129813
write(tempVarName);
2981229814
write(": ");
2981329815
writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
29814-
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 | 1024, writer);
29816+
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2, writer);
2981529817
write(";");
2981629818
writeLine();
2981729819
write(node.isExportEquals ? "export = " : "export default ");
@@ -30216,7 +30218,7 @@ var ts;
3021630218
}
3021730219
else {
3021830220
writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
30219-
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 | 1024, writer);
30221+
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2, writer);
3022030222
}
3022130223
function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
3022230224
var diagnosticMessage;
@@ -32295,14 +32297,14 @@ var ts;
3229532297
write(" = ");
3229632298
emitObjectLiteralBody(node, firstComputedPropertyIndex);
3229732299
for (var i = firstComputedPropertyIndex, n = properties.length; i < n; i++) {
32298-
writeComma();
3229932300
var property = properties[i];
32300-
emitStart(property);
3230132301
if (property.kind === 149 || property.kind === 150) {
3230232302
var accessors = ts.getAllAccessorDeclarations(node.properties, property);
3230332303
if (property !== accessors.firstAccessor) {
3230432304
continue;
3230532305
}
32306+
writeComma();
32307+
emitStart(property);
3230632308
write("Object.defineProperty(");
3230732309
emit(tempVar);
3230832310
write(", ");
@@ -32343,6 +32345,8 @@ var ts;
3234332345
emitEnd(property);
3234432346
}
3234532347
else {
32348+
writeComma();
32349+
emitStart(property);
3234632350
emitLeadingComments(property);
3234732351
emitStart(property.name);
3234832352
emit(tempVar);
@@ -32361,8 +32365,8 @@ var ts;
3236132365
else {
3236232366
ts.Debug.fail("ObjectLiteralElement type not accounted for: " + property.kind);
3236332367
}
32368+
emitEnd(property);
3236432369
}
32365-
emitEnd(property);
3236632370
}
3236732371
writeComma();
3236832372
emit(tempVar);
@@ -32806,7 +32810,11 @@ var ts;
3280632810
if (modulekind === ts.ModuleKind.System || node.kind !== 69 || ts.nodeIsSynthesized(node)) {
3280732811
return false;
3280832812
}
32809-
return !exportEquals && exportSpecifiers && node.text in exportSpecifiers;
32813+
if (exportEquals || !exportSpecifiers || !(node.text in exportSpecifiers)) {
32814+
return false;
32815+
}
32816+
var declaration = resolver.getReferencedValueDeclaration(node);
32817+
return declaration && ts.getEnclosingBlockScopeContainer(declaration).kind === 256;
3281032818
}
3281132819
function emitPrefixUnaryExpression(node) {
3281232820
var isPlusPlusOrMinusMinus = (node.operator === 41

0 commit comments

Comments
 (0)