Skip to content

Commit

Permalink
Update LKG
Browse files Browse the repository at this point in the history
  • Loading branch information
mhegazy committed Oct 23, 2016
1 parent f0aa3b8 commit 80bca64
Show file tree
Hide file tree
Showing 10 changed files with 3,528 additions and 643 deletions.
1,700 changes: 1,700 additions & 0 deletions lib/protocol.d.ts

Large diffs are not rendered by default.

66 changes: 37 additions & 29 deletions lib/tsc.js
Expand Up @@ -125,6 +125,7 @@ var ts;
var ts;
(function (ts) {
var createObject = Object.create;
ts.collator = typeof Intl === "object" && typeof Intl.Collator === "function" ? new Intl.Collator() : undefined;
function createMap(template) {
var map = createObject(null);
map["__"] = undefined;
Expand Down Expand Up @@ -682,7 +683,7 @@ var ts;
if (b === undefined)
return 1;
if (ignoreCase) {
if (String.prototype.localeCompare) {
if (ts.collator && String.prototype.localeCompare) {
var result = a.localeCompare(b, undefined, { usage: "sort", sensitivity: "accent" });
return result < 0 ? -1 : result > 0 ? 1 : 0;
}
Expand Down Expand Up @@ -1710,6 +1711,9 @@ var ts;
},
watchDirectory: function (directoryName, callback, recursive) {
var options;
if (!directoryExists(directoryName)) {
return;
}
if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
options = { persistent: true, recursive: !!recursive };
}
Expand Down Expand Up @@ -14986,14 +14990,14 @@ var ts;
}
return false;
}
function isSymbolAccessible(symbol, enclosingDeclaration, meaning) {
function isSymbolAccessible(symbol, enclosingDeclaration, meaning, shouldComputeAliasesToMakeVisible) {
if (symbol && enclosingDeclaration && !(symbol.flags & 262144)) {
var initialSymbol = symbol;
var meaningToLook = meaning;
while (symbol) {
var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaningToLook, false);
if (accessibleSymbolChain) {
var hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0]);
var hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0], shouldComputeAliasesToMakeVisible);
if (!hasAccessibleDeclarations) {
return {
accessibility: 1,
Expand Down Expand Up @@ -15034,7 +15038,7 @@ var ts;
function hasExternalModuleSymbol(declaration) {
return ts.isAmbientModule(declaration) || (declaration.kind === 256 && ts.isExternalOrCommonJsModule(declaration));
}
function hasVisibleDeclarations(symbol) {
function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
var aliasesToMakeVisible;
if (ts.forEach(symbol.declarations, function (declaration) { return !getIsDeclarationVisible(declaration); })) {
return undefined;
Expand All @@ -15046,14 +15050,16 @@ var ts;
if (anyImportSyntax &&
!(anyImportSyntax.flags & 1) &&
isDeclarationVisible(anyImportSyntax.parent)) {
getNodeLinks(declaration).isVisible = true;
if (aliasesToMakeVisible) {
if (!ts.contains(aliasesToMakeVisible, anyImportSyntax)) {
aliasesToMakeVisible.push(anyImportSyntax);
if (shouldComputeAliasToMakeVisible) {
getNodeLinks(declaration).isVisible = true;
if (aliasesToMakeVisible) {
if (!ts.contains(aliasesToMakeVisible, anyImportSyntax)) {
aliasesToMakeVisible.push(anyImportSyntax);
}
}
else {
aliasesToMakeVisible = [anyImportSyntax];
}
}
else {
aliasesToMakeVisible = [anyImportSyntax];
}
return true;
}
Expand All @@ -15076,7 +15082,7 @@ var ts;
}
var firstIdentifier = getFirstIdentifier(entityName);
var symbol = resolveName(enclosingDeclaration, firstIdentifier.text, meaning, undefined, undefined);
return (symbol && hasVisibleDeclarations(symbol)) || {
return (symbol && hasVisibleDeclarations(symbol, true)) || {
accessibility: 1,
errorSymbolName: ts.getTextOfNode(firstIdentifier),
errorNode: firstIdentifier
Expand Down Expand Up @@ -15293,14 +15299,10 @@ var ts;
else if (type.flags & (32768 | 65536 | 16 | 16384)) {
buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793064, 0, nextFlags);
}
else if (!(flags & 512) && type.flags & (2097152 | 1572864) && type.aliasSymbol) {
if (type.flags & 2097152 || !(flags & 1024)) {
var typeArguments = type.aliasTypeArguments;
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
}
else {
writeUnionOrIntersectionType(type, nextFlags);
}
else if (!(flags & 512) && ((type.flags & 2097152 && !type.target) || type.flags & 1572864) && type.aliasSymbol &&
isSymbolAccessible(type.aliasSymbol, enclosingDeclaration, 793064, false).accessibility === 0) {
var typeArguments = type.aliasTypeArguments;
writeSymbolTypeReference(type.aliasSymbol, typeArguments, 0, typeArguments ? typeArguments.length : 0, nextFlags);
}
else if (type.flags & 1572864) {
writeUnionOrIntersectionType(type, nextFlags);
Expand Down Expand Up @@ -29589,7 +29591,7 @@ var ts;
}
}
function trackSymbol(symbol, enclosingDeclaration, meaning) {
handleSymbolAccessibilityError(resolver.isSymbolAccessible(symbol, enclosingDeclaration, meaning));
handleSymbolAccessibilityError(resolver.isSymbolAccessible(symbol, enclosingDeclaration, meaning, true));
recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForSymbol(symbol, meaning));
}
function reportInaccessibleThisError() {
Expand All @@ -29606,7 +29608,7 @@ var ts;
}
else {
errorNameNode = declaration.name;
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 | 1024, writer);
resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2, writer);
errorNameNode = undefined;
}
}
Expand All @@ -29618,7 +29620,7 @@ var ts;
}
else {
errorNameNode = signature.name;
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 | 1024, writer);
resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2, writer);
errorNameNode = undefined;
}
}
Expand Down Expand Up @@ -29811,7 +29813,7 @@ var ts;
write(tempVarName);
write(": ");
writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 | 1024, writer);
resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2, writer);
write(";");
writeLine();
write(node.isExportEquals ? "export = " : "export default ");
Expand Down Expand Up @@ -30216,7 +30218,7 @@ var ts;
}
else {
writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 | 1024, writer);
resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2, writer);
}
function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
var diagnosticMessage;
Expand Down Expand Up @@ -32295,14 +32297,14 @@ var ts;
write(" = ");
emitObjectLiteralBody(node, firstComputedPropertyIndex);
for (var i = firstComputedPropertyIndex, n = properties.length; i < n; i++) {
writeComma();
var property = properties[i];
emitStart(property);
if (property.kind === 149 || property.kind === 150) {
var accessors = ts.getAllAccessorDeclarations(node.properties, property);
if (property !== accessors.firstAccessor) {
continue;
}
writeComma();
emitStart(property);
write("Object.defineProperty(");
emit(tempVar);
write(", ");
Expand Down Expand Up @@ -32343,6 +32345,8 @@ var ts;
emitEnd(property);
}
else {
writeComma();
emitStart(property);
emitLeadingComments(property);
emitStart(property.name);
emit(tempVar);
Expand All @@ -32361,8 +32365,8 @@ var ts;
else {
ts.Debug.fail("ObjectLiteralElement type not accounted for: " + property.kind);
}
emitEnd(property);
}
emitEnd(property);
}
writeComma();
emit(tempVar);
Expand Down Expand Up @@ -32806,7 +32810,11 @@ var ts;
if (modulekind === ts.ModuleKind.System || node.kind !== 69 || ts.nodeIsSynthesized(node)) {
return false;
}
return !exportEquals && exportSpecifiers && node.text in exportSpecifiers;
if (exportEquals || !exportSpecifiers || !(node.text in exportSpecifiers)) {
return false;
}
var declaration = resolver.getReferencedValueDeclaration(node);
return declaration && ts.getEnclosingBlockScopeContainer(declaration).kind === 256;
}
function emitPrefixUnaryExpression(node) {
var isPlusPlusOrMinusMinus = (node.operator === 41
Expand Down

0 comments on commit 80bca64

Please sign in to comment.