Revert "Merge pull request #11354 from Microsoft/map4"#11908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Oct 27, 2016
Merged

Revert "Merge pull request #11354 from Microsoft/map4" #11908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Jakefile.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,6 @@ function measure(marker) {
}

var compilerSources = [
"collections.ts",
"core.ts",
"performance.ts",
"sys.ts",
Expand DownExpand Up@@ -94,7 +93,6 @@ var compilerSources = [
});

var servicesSources = [
"collections.ts",
"core.ts",
"performance.ts",
"sys.ts",
Expand Down
18 changes: 9 additions & 9 deletions scripts/processDiagnosticMessages.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function main(): void {

var inputFilePath = sys.args[0].replace(/\\/g, "/");
var inputStr = sys.readFile(inputFilePath);

var diagnosticMessages: InputDiagnosticMessageTable = JSON.parse(inputStr);

var names = Utilities.getObjectKeys(diagnosticMessages);
Expand All@@ -44,7 +44,7 @@ function main(): void {
function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosticMessageTable) {
const originalMessageForCode: string[] = [];
let numConflicts = 0;

for (const currentMessage of messages) {
const code = diagnosticTable[currentMessage].code;

Expand All@@ -68,19 +68,19 @@ function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosti
}
}

function buildUniqueNameMap(names: string[]): ts.Map<string, string> {
var nameMap = ts.createMap<string, string>();
function buildUniqueNameMap(names: string[]): ts.Map<string> {
var nameMap = ts.createMap<string>();

var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

for (var i = 0; i < names.length; i++) {
nameMap.set(names[i], uniqueNames[i]);
nameMap[names[i]] = uniqueNames[i];
}

return nameMap;
}

function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
var result =
'// <auto-generated />\r\n' +
'/// <reference path="types.ts" />\r\n' +
Expand All@@ -91,7 +91,7 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
for (var i = 0; i < names.length; i++) {
var name = names[i];
var diagnosticDetails = messageTable[name];
var propName = convertPropertyName(nameMap.get(name));
var propName = convertPropertyName(nameMap[name]);

result +=
' ' + propName +
Expand All@@ -107,14 +107,14 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
return result;
}

function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
var result =
'{';
var names = Utilities.getObjectKeys(messageTable);
for (var i = 0; i < names.length; i++) {
var name = names[i];
var diagnosticDetails = messageTable[name];
var propName = convertPropertyName(nameMap.get(name));
var propName = convertPropertyName(nameMap[name]);

result += '\r\n "' + createKey(propName, diagnosticDetails.code) + '"' + ' : "' + name.replace(/[\"]/g, '\\"') + '"';
if (i !== names.length - 1) {
Expand Down
44 changes: 22 additions & 22 deletions src/compiler/binder.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,7 @@ namespace ts {

let symbolCount = 0;
let Symbol: { new (flags: SymbolFlags, name: string): Symbol };
let classifiableNames: Set<string>;
let classifiableNames: Map<string>;

const unreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
const reportedUnreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
Expand All@@ -147,7 +147,7 @@ namespace ts {
options = opts;
languageVersion = getEmitScriptTarget(options);
inStrictMode = bindInStrictMode(file, opts);
classifiableNames = createSet();
classifiableNames = createMap<string>();
symbolCount = 0;
skipTransformFlagAggregation = isDeclarationFile(file);

Expand DownExpand Up@@ -207,11 +207,11 @@ namespace ts {
symbol.declarations.push(node);

if (symbolFlags & SymbolFlags.HasExports && !symbol.exports) {
symbol.exports = createMap<string, Symbol>();
symbol.exports = createMap<Symbol>();
}

if (symbolFlags & SymbolFlags.HasMembers && !symbol.members) {
symbol.members = createMap<string, Symbol>();
symbol.members = createMap<Symbol>();
}

if (symbolFlags & SymbolFlags.Value) {
Expand DownExpand Up@@ -349,17 +349,17 @@ namespace ts {
// Otherwise, we'll be merging into a compatible existing symbol (for example when
// you have multiple 'vars' with the same name in the same container). In this case
// just add this node into the declarations list of the symbol.
symbol = getOrUpdate(symbolTable, name, name => createSymbol(SymbolFlags.None, name));
symbol = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));

if (name && (includes & SymbolFlags.Classifiable)) {
classifiableNames.add(name);
classifiableNames[name] = name;
}

if (symbol.flags & excludes) {
if (symbol.isReplaceableByMethod) {
// Javascript constructor-declared symbols can be discarded in favor of
// prototype symbols like methods.
symbol = setAndReturn(symbolTable, name, createSymbol(SymbolFlags.None, name));
symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
}
else {
if (node.name) {
Expand DownExpand Up@@ -484,7 +484,7 @@ namespace ts {
if (containerFlags & ContainerFlags.IsContainer) {
container = blockScopeContainer = node;
if (containerFlags & ContainerFlags.HasLocals) {
container.locals = createMap<string, Symbol>();
container.locals = createMap<Symbol>();
}
addToContainerChain(container);
}
Expand DownExpand Up@@ -1525,7 +1525,8 @@ namespace ts {

const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
typeLiteralSymbol.members = createMap([[symbol.name, symbol]]);
typeLiteralSymbol.members = createMap<Symbol>();
typeLiteralSymbol.members[symbol.name] = symbol;
}

function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand All@@ -1535,7 +1536,7 @@ namespace ts {
}

if (inStrictMode) {
const seen = createMap<string, ElementKind>();
const seen = createMap<ElementKind>();

for (const prop of node.properties) {
if (prop.name.kind !== SyntaxKind.Identifier) {
Expand All@@ -1556,9 +1557,9 @@ namespace ts {
? ElementKind.Property
: ElementKind.Accessor;

const existingKind = seen.get(identifier.text);
const existingKind = seen[identifier.text];
if (!existingKind) {
seen.set(identifier.text, currentKind);
seen[identifier.text] = currentKind;
continue;
}

Expand DownExpand Up@@ -1591,7 +1592,7 @@ namespace ts {
// fall through.
default:
if (!blockScopeContainer.locals) {
blockScopeContainer.locals = createMap<string, Symbol>();
blockScopeContainer.locals = createMap<Symbol>();
addToContainerChain(blockScopeContainer);
}
declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
Expand DownExpand Up@@ -2071,7 +2072,7 @@ namespace ts {
}
}

file.symbol.globalExports = file.symbol.globalExports || createMap<string, Symbol>();
file.symbol.globalExports = file.symbol.globalExports || createMap<Symbol>();
declareSymbol(file.symbol.globalExports, file.symbol, node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
}

Expand DownExpand Up@@ -2118,7 +2119,7 @@ namespace ts {
Debug.assert(isInJavaScriptFile(node));
// Declare a 'member' if the container is an ES5 class or ES6 constructor
if (container.kind === SyntaxKind.FunctionDeclaration || container.kind === SyntaxKind.FunctionExpression) {
container.symbol.members = container.symbol.members || createMap<string, Symbol>();
container.symbol.members = container.symbol.members || createMap<Symbol>();
// It's acceptable for multiple 'this' assignments of the same identifier to occur
declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property);
}
Expand DownExpand Up@@ -2150,14 +2151,14 @@ namespace ts {
constructorFunction.parent = classPrototype;
classPrototype.parent = leftSideOfAssignment;

const funcSymbol = container.locals.get(constructorFunction.text);
const funcSymbol = container.locals[constructorFunction.text];
if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
return;
}

// Set up the members collection if it doesn't exist already
if (!funcSymbol.members) {
funcSymbol.members = createMap<string, Symbol>();
funcSymbol.members = createMap<Symbol>();
}

// Declare the method/property
Expand DownExpand Up@@ -2190,7 +2191,7 @@ namespace ts {
bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
// Add name of class expression into the map for semantic classifier
if (node.name) {
classifiableNames.add(node.name.text);
classifiableNames[node.name.text] = node.name.text;
}
}

Expand All@@ -2206,15 +2207,14 @@ namespace ts {
// module might have an exported variable called 'prototype'. We can't allow that as
// that would clash with the built-in 'prototype' for the class.
const prototypeSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Prototype, "prototype");
const symbolExport = symbol.exports.get(prototypeSymbol.name);
if (symbolExport) {
if (symbol.exports[prototypeSymbol.name]) {
if (node.name) {
node.name.parent = node;
}
file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0],
file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
}
symbol.exports.set(prototypeSymbol.name, prototypeSymbol);
symbol.exports[prototypeSymbol.name] = prototypeSymbol;
prototypeSymbol.parent = symbol;
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Revert "Merge pull request #11354 from Microsoft/map4"#11908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged


1 commit merged into

from

Oct 27, 2016
 Merged


Revert "Merge pull request #11354 from Microsoft/map4"
#11908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 0 additions & 2 deletions
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,6 @@ function measure(marker) {
}

var compilerSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand DownExpand Up@@ -94,7 +93,6 @@ var compilerSources = [
});

var servicesSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand Down

18 changes: 9 additions & 9 deletions
scripts/processDiagnosticMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function main(): void {

 var inputFilePath = sys.args[0].replace(/\\/g, "/");
 var inputStr = sys.readFile(inputFilePath);

 var diagnosticMessages: InputDiagnosticMessageTable = JSON.parse(inputStr);

 var names = Utilities.getObjectKeys(diagnosticMessages);
Expand All@@ -44,7 +44,7 @@ function main(): void {
function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosticMessageTable) {
 const originalMessageForCode: string[] = [];
 let numConflicts = 0;

 for (const currentMessage of messages) {
 const code = diagnosticTable[currentMessage].code;

Expand All@@ -68,19 +68,19 @@ function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosti
 }
}

function buildUniqueNameMap(names: string[]): ts.Map<string, string> {
 var nameMap = ts.createMap<string, string>();
function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var nameMap = ts.createMap<string>();

 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

 for (var i = 0; i < names.length; i++) {
 nameMap.set(names[i], uniqueNames[i]);
 nameMap[names[i]] = uniqueNames[i];
 }

 return nameMap;
}

function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '// <auto-generated />\r\n' +
 '/// <reference path="types.ts" />\r\n' +
Expand All@@ -91,7 +91,7 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result +=
 ' ' + propName +
Expand All@@ -107,14 +107,14 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 return result;
}

function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '{';
 var names = Utilities.getObjectKeys(messageTable);
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result += '\r\n "' + createKey(propName, diagnosticDetails.code) + '"' + ' : "' + name.replace(/[\"]/g, '\\"') + '"';
 if (i !== names.length - 1) {
Expand Down

44 changes: 22 additions & 22 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,7 @@ namespace ts {

 let symbolCount = 0;
 let Symbol: { new (flags: SymbolFlags, name: string): Symbol };
 let classifiableNames: Set<string>;
 let classifiableNames: Map<string>;

 const unreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
 const reportedUnreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
Expand All@@ -147,7 +147,7 @@ namespace ts {
 options = opts;
 languageVersion = getEmitScriptTarget(options);
 inStrictMode = bindInStrictMode(file, opts);
 classifiableNames = createSet();
 classifiableNames = createMap<string>();
 symbolCount = 0;
 skipTransformFlagAggregation = isDeclarationFile(file);

Expand DownExpand Up@@ -207,11 +207,11 @@ namespace ts {
 symbol.declarations.push(node);

 if (symbolFlags & SymbolFlags.HasExports && !symbol.exports) {
 symbol.exports = createMap<string, Symbol>();
 symbol.exports = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.HasMembers && !symbol.members) {
 symbol.members = createMap<string, Symbol>();
 symbol.members = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.Value) {
Expand DownExpand Up@@ -349,17 +349,17 @@ namespace ts {
 // Otherwise, we'll be merging into a compatible existing symbol (for example when
 // you have multiple 'vars' with the same name in the same container). In this case
 // just add this node into the declarations list of the symbol.
 symbol = getOrUpdate(symbolTable, name, name => createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));

 if (name && (includes & SymbolFlags.Classifiable)) {
 classifiableNames.add(name);
 classifiableNames[name] = name;
 }

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
 symbol = setAndReturn(symbolTable, name, createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -484,7 +484,7 @@ namespace ts {
 if (containerFlags & ContainerFlags.IsContainer) {
 container = blockScopeContainer = node;
 if (containerFlags & ContainerFlags.HasLocals) {
 container.locals = createMap<string, Symbol>();
 container.locals = createMap<Symbol>();
 }
 addToContainerChain(container);
 }
Expand DownExpand Up@@ -1525,7 +1525,8 @@ namespace ts {

 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap([[symbol.name, symbol]]);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand All@@ -1535,7 +1536,7 @@ namespace ts {
 }

 if (inStrictMode) {
 const seen = createMap<string, ElementKind>();
 const seen = createMap<ElementKind>();

 for (const prop of node.properties) {
 if (prop.name.kind !== SyntaxKind.Identifier) {
Expand All@@ -1556,9 +1557,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

 const existingKind = seen.get(identifier.text);
 const existingKind = seen[identifier.text];
 if (!existingKind) {
 seen.set(identifier.text, currentKind);
 seen[identifier.text] = currentKind;
 continue;
 }

Expand DownExpand Up@@ -1591,7 +1592,7 @@ namespace ts {
 // fall through.
 default:
 if (!blockScopeContainer.locals) {
 blockScopeContainer.locals = createMap<string, Symbol>();
 blockScopeContainer.locals = createMap<Symbol>();
 addToContainerChain(blockScopeContainer);
 }
 declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
Expand DownExpand Up@@ -2071,7 +2072,7 @@ namespace ts {
 }
 }

 file.symbol.globalExports = file.symbol.globalExports || createMap<string, Symbol>();
 file.symbol.globalExports = file.symbol.globalExports || createMap<Symbol>();
 declareSymbol(file.symbol.globalExports, file.symbol, node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
 }

Expand DownExpand Up@@ -2118,7 +2119,7 @@ namespace ts {
 Debug.assert(isInJavaScriptFile(node));
 // Declare a 'member' if the container is an ES5 class or ES6 constructor
 if (container.kind === SyntaxKind.FunctionDeclaration || container.kind === SyntaxKind.FunctionExpression) {
 container.symbol.members = container.symbol.members || createMap<string, Symbol>();
 container.symbol.members = container.symbol.members || createMap<Symbol>();
 // It's acceptable for multiple 'this' assignments of the same identifier to occur
 declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property);
 }
Expand DownExpand Up@@ -2150,14 +2151,14 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals.get(constructorFunction.text);
 const funcSymbol = container.locals[constructorFunction.text];
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }

 // Set up the members collection if it doesn't exist already
 if (!funcSymbol.members) {
 funcSymbol.members = createMap<string, Symbol>();
 funcSymbol.members = createMap<Symbol>();
 }

 // Declare the method/property
Expand DownExpand Up@@ -2190,7 +2191,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames.add(node.name.text);
 classifiableNames[node.name.text] = node.name.text;
 }
 }

Expand All@@ -2206,15 +2207,14 @@ namespace ts {
 // module might have an exported variable called 'prototype'. We can't allow that as
 // that would clash with the built-in 'prototype' for the class.
 const prototypeSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Prototype, "prototype");
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (symbol.exports[prototypeSymbol.name]) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0],
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports.set(prototypeSymbol.name, prototypeSymbol);
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 prototypeSymbol.parent = symbol;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Revert "Merge pull request #11354 from Microsoft/map4"#11908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged


1 commit merged into

from

Oct 27, 2016
 Merged


Revert "Merge pull request #11354 from Microsoft/map4"
#11908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 0 additions & 2 deletions
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,6 @@ function measure(marker) {
}

var compilerSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand DownExpand Up@@ -94,7 +93,6 @@ var compilerSources = [
});

var servicesSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand Down

18 changes: 9 additions & 9 deletions
scripts/processDiagnosticMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function main(): void {

 var inputFilePath = sys.args[0].replace(/\\/g, "/");
 var inputStr = sys.readFile(inputFilePath);

 var diagnosticMessages: InputDiagnosticMessageTable = JSON.parse(inputStr);

 var names = Utilities.getObjectKeys(diagnosticMessages);
Expand All@@ -44,7 +44,7 @@ function main(): void {
function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosticMessageTable) {
 const originalMessageForCode: string[] = [];
 let numConflicts = 0;

 for (const currentMessage of messages) {
 const code = diagnosticTable[currentMessage].code;

Expand All@@ -68,19 +68,19 @@ function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosti
 }
}

function buildUniqueNameMap(names: string[]): ts.Map<string, string> {
 var nameMap = ts.createMap<string, string>();
function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var nameMap = ts.createMap<string>();

 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

 for (var i = 0; i < names.length; i++) {
 nameMap.set(names[i], uniqueNames[i]);
 nameMap[names[i]] = uniqueNames[i];
 }

 return nameMap;
}

function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '// <auto-generated />\r\n' +
 '/// <reference path="types.ts" />\r\n' +
Expand All@@ -91,7 +91,7 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result +=
 ' ' + propName +
Expand All@@ -107,14 +107,14 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 return result;
}

function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '{';
 var names = Utilities.getObjectKeys(messageTable);
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result += '\r\n "' + createKey(propName, diagnosticDetails.code) + '"' + ' : "' + name.replace(/[\"]/g, '\\"') + '"';
 if (i !== names.length - 1) {
Expand Down

44 changes: 22 additions & 22 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,7 @@ namespace ts {

 let symbolCount = 0;
 let Symbol: { new (flags: SymbolFlags, name: string): Symbol };
 let classifiableNames: Set<string>;
 let classifiableNames: Map<string>;

 const unreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
 const reportedUnreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
Expand All@@ -147,7 +147,7 @@ namespace ts {
 options = opts;
 languageVersion = getEmitScriptTarget(options);
 inStrictMode = bindInStrictMode(file, opts);
 classifiableNames = createSet();
 classifiableNames = createMap<string>();
 symbolCount = 0;
 skipTransformFlagAggregation = isDeclarationFile(file);

Expand DownExpand Up@@ -207,11 +207,11 @@ namespace ts {
 symbol.declarations.push(node);

 if (symbolFlags & SymbolFlags.HasExports && !symbol.exports) {
 symbol.exports = createMap<string, Symbol>();
 symbol.exports = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.HasMembers && !symbol.members) {
 symbol.members = createMap<string, Symbol>();
 symbol.members = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.Value) {
Expand DownExpand Up@@ -349,17 +349,17 @@ namespace ts {
 // Otherwise, we'll be merging into a compatible existing symbol (for example when
 // you have multiple 'vars' with the same name in the same container). In this case
 // just add this node into the declarations list of the symbol.
 symbol = getOrUpdate(symbolTable, name, name => createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));

 if (name && (includes & SymbolFlags.Classifiable)) {
 classifiableNames.add(name);
 classifiableNames[name] = name;
 }

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
 symbol = setAndReturn(symbolTable, name, createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -484,7 +484,7 @@ namespace ts {
 if (containerFlags & ContainerFlags.IsContainer) {
 container = blockScopeContainer = node;
 if (containerFlags & ContainerFlags.HasLocals) {
 container.locals = createMap<string, Symbol>();
 container.locals = createMap<Symbol>();
 }
 addToContainerChain(container);
 }
Expand DownExpand Up@@ -1525,7 +1525,8 @@ namespace ts {

 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap([[symbol.name, symbol]]);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand All@@ -1535,7 +1536,7 @@ namespace ts {
 }

 if (inStrictMode) {
 const seen = createMap<string, ElementKind>();
 const seen = createMap<ElementKind>();

 for (const prop of node.properties) {
 if (prop.name.kind !== SyntaxKind.Identifier) {
Expand All@@ -1556,9 +1557,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

 const existingKind = seen.get(identifier.text);
 const existingKind = seen[identifier.text];
 if (!existingKind) {
 seen.set(identifier.text, currentKind);
 seen[identifier.text] = currentKind;
 continue;
 }

Expand DownExpand Up@@ -1591,7 +1592,7 @@ namespace ts {
 // fall through.
 default:
 if (!blockScopeContainer.locals) {
 blockScopeContainer.locals = createMap<string, Symbol>();
 blockScopeContainer.locals = createMap<Symbol>();
 addToContainerChain(blockScopeContainer);
 }
 declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
Expand DownExpand Up@@ -2071,7 +2072,7 @@ namespace ts {
 }
 }

 file.symbol.globalExports = file.symbol.globalExports || createMap<string, Symbol>();
 file.symbol.globalExports = file.symbol.globalExports || createMap<Symbol>();
 declareSymbol(file.symbol.globalExports, file.symbol, node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
 }

Expand DownExpand Up@@ -2118,7 +2119,7 @@ namespace ts {
 Debug.assert(isInJavaScriptFile(node));
 // Declare a 'member' if the container is an ES5 class or ES6 constructor
 if (container.kind === SyntaxKind.FunctionDeclaration || container.kind === SyntaxKind.FunctionExpression) {
 container.symbol.members = container.symbol.members || createMap<string, Symbol>();
 container.symbol.members = container.symbol.members || createMap<Symbol>();
 // It's acceptable for multiple 'this' assignments of the same identifier to occur
 declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property);
 }
Expand DownExpand Up@@ -2150,14 +2151,14 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals.get(constructorFunction.text);
 const funcSymbol = container.locals[constructorFunction.text];
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }

 // Set up the members collection if it doesn't exist already
 if (!funcSymbol.members) {
 funcSymbol.members = createMap<string, Symbol>();
 funcSymbol.members = createMap<Symbol>();
 }

 // Declare the method/property
Expand DownExpand Up@@ -2190,7 +2191,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames.add(node.name.text);
 classifiableNames[node.name.text] = node.name.text;
 }
 }

Expand All@@ -2206,15 +2207,14 @@ namespace ts {
 // module might have an exported variable called 'prototype'. We can't allow that as
 // that would clash with the built-in 'prototype' for the class.
 const prototypeSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Prototype, "prototype");
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (symbol.exports[prototypeSymbol.name]) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0],
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports.set(prototypeSymbol.name, prototypeSymbol);
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 prototypeSymbol.parent = symbol;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Revert "Merge pull request #11354 from Microsoft/map4"#11908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged


1 commit merged into

from

Oct 27, 2016
 Merged


Revert "Merge pull request #11354 from Microsoft/map4"
#11908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 0 additions & 2 deletions
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,6 @@ function measure(marker) {
}

var compilerSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand DownExpand Up@@ -94,7 +93,6 @@ var compilerSources = [
});

var servicesSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand Down

18 changes: 9 additions & 9 deletions
scripts/processDiagnosticMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function main(): void {

 var inputFilePath = sys.args[0].replace(/\\/g, "/");
 var inputStr = sys.readFile(inputFilePath);

 var diagnosticMessages: InputDiagnosticMessageTable = JSON.parse(inputStr);

 var names = Utilities.getObjectKeys(diagnosticMessages);
Expand All@@ -44,7 +44,7 @@ function main(): void {
function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosticMessageTable) {
 const originalMessageForCode: string[] = [];
 let numConflicts = 0;

 for (const currentMessage of messages) {
 const code = diagnosticTable[currentMessage].code;

Expand All@@ -68,19 +68,19 @@ function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosti
 }
}

function buildUniqueNameMap(names: string[]): ts.Map<string, string> {
 var nameMap = ts.createMap<string, string>();
function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var nameMap = ts.createMap<string>();

 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

 for (var i = 0; i < names.length; i++) {
 nameMap.set(names[i], uniqueNames[i]);
 nameMap[names[i]] = uniqueNames[i];
 }

 return nameMap;
}

function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '// <auto-generated />\r\n' +
 '/// <reference path="types.ts" />\r\n' +
Expand All@@ -91,7 +91,7 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result +=
 ' ' + propName +
Expand All@@ -107,14 +107,14 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 return result;
}

function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '{';
 var names = Utilities.getObjectKeys(messageTable);
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result += '\r\n "' + createKey(propName, diagnosticDetails.code) + '"' + ' : "' + name.replace(/[\"]/g, '\\"') + '"';
 if (i !== names.length - 1) {
Expand Down

44 changes: 22 additions & 22 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,7 @@ namespace ts {

 let symbolCount = 0;
 let Symbol: { new (flags: SymbolFlags, name: string): Symbol };
 let classifiableNames: Set<string>;
 let classifiableNames: Map<string>;

 const unreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
 const reportedUnreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
Expand All@@ -147,7 +147,7 @@ namespace ts {
 options = opts;
 languageVersion = getEmitScriptTarget(options);
 inStrictMode = bindInStrictMode(file, opts);
 classifiableNames = createSet();
 classifiableNames = createMap<string>();
 symbolCount = 0;
 skipTransformFlagAggregation = isDeclarationFile(file);

Expand DownExpand Up@@ -207,11 +207,11 @@ namespace ts {
 symbol.declarations.push(node);

 if (symbolFlags & SymbolFlags.HasExports && !symbol.exports) {
 symbol.exports = createMap<string, Symbol>();
 symbol.exports = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.HasMembers && !symbol.members) {
 symbol.members = createMap<string, Symbol>();
 symbol.members = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.Value) {
Expand DownExpand Up@@ -349,17 +349,17 @@ namespace ts {
 // Otherwise, we'll be merging into a compatible existing symbol (for example when
 // you have multiple 'vars' with the same name in the same container). In this case
 // just add this node into the declarations list of the symbol.
 symbol = getOrUpdate(symbolTable, name, name => createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));

 if (name && (includes & SymbolFlags.Classifiable)) {
 classifiableNames.add(name);
 classifiableNames[name] = name;
 }

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
 symbol = setAndReturn(symbolTable, name, createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -484,7 +484,7 @@ namespace ts {
 if (containerFlags & ContainerFlags.IsContainer) {
 container = blockScopeContainer = node;
 if (containerFlags & ContainerFlags.HasLocals) {
 container.locals = createMap<string, Symbol>();
 container.locals = createMap<Symbol>();
 }
 addToContainerChain(container);
 }
Expand DownExpand Up@@ -1525,7 +1525,8 @@ namespace ts {

 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap([[symbol.name, symbol]]);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand All@@ -1535,7 +1536,7 @@ namespace ts {
 }

 if (inStrictMode) {
 const seen = createMap<string, ElementKind>();
 const seen = createMap<ElementKind>();

 for (const prop of node.properties) {
 if (prop.name.kind !== SyntaxKind.Identifier) {
Expand All@@ -1556,9 +1557,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

 const existingKind = seen.get(identifier.text);
 const existingKind = seen[identifier.text];
 if (!existingKind) {
 seen.set(identifier.text, currentKind);
 seen[identifier.text] = currentKind;
 continue;
 }

Expand DownExpand Up@@ -1591,7 +1592,7 @@ namespace ts {
 // fall through.
 default:
 if (!blockScopeContainer.locals) {
 blockScopeContainer.locals = createMap<string, Symbol>();
 blockScopeContainer.locals = createMap<Symbol>();
 addToContainerChain(blockScopeContainer);
 }
 declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
Expand DownExpand Up@@ -2071,7 +2072,7 @@ namespace ts {
 }
 }

 file.symbol.globalExports = file.symbol.globalExports || createMap<string, Symbol>();
 file.symbol.globalExports = file.symbol.globalExports || createMap<Symbol>();
 declareSymbol(file.symbol.globalExports, file.symbol, node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
 }

Expand DownExpand Up@@ -2118,7 +2119,7 @@ namespace ts {
 Debug.assert(isInJavaScriptFile(node));
 // Declare a 'member' if the container is an ES5 class or ES6 constructor
 if (container.kind === SyntaxKind.FunctionDeclaration || container.kind === SyntaxKind.FunctionExpression) {
 container.symbol.members = container.symbol.members || createMap<string, Symbol>();
 container.symbol.members = container.symbol.members || createMap<Symbol>();
 // It's acceptable for multiple 'this' assignments of the same identifier to occur
 declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property);
 }
Expand DownExpand Up@@ -2150,14 +2151,14 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals.get(constructorFunction.text);
 const funcSymbol = container.locals[constructorFunction.text];
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }

 // Set up the members collection if it doesn't exist already
 if (!funcSymbol.members) {
 funcSymbol.members = createMap<string, Symbol>();
 funcSymbol.members = createMap<Symbol>();
 }

 // Declare the method/property
Expand DownExpand Up@@ -2190,7 +2191,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames.add(node.name.text);
 classifiableNames[node.name.text] = node.name.text;
 }
 }

Expand All@@ -2206,15 +2207,14 @@ namespace ts {
 // module might have an exported variable called 'prototype'. We can't allow that as
 // that would clash with the built-in 'prototype' for the class.
 const prototypeSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Prototype, "prototype");
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (symbol.exports[prototypeSymbol.name]) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0],
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports.set(prototypeSymbol.name, prototypeSymbol);
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 prototypeSymbol.parent = symbol;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Revert "Merge pull request #11354 from Microsoft/map4"#11908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged


1 commit merged into

from

Oct 27, 2016
 Merged


Revert "Merge pull request #11354 from Microsoft/map4"
#11908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 0 additions & 2 deletions
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,6 @@ function measure(marker) {
}

var compilerSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand DownExpand Up@@ -94,7 +93,6 @@ var compilerSources = [
});

var servicesSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand Down

18 changes: 9 additions & 9 deletions
scripts/processDiagnosticMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function main(): void {

 var inputFilePath = sys.args[0].replace(/\\/g, "/");
 var inputStr = sys.readFile(inputFilePath);

 var diagnosticMessages: InputDiagnosticMessageTable = JSON.parse(inputStr);

 var names = Utilities.getObjectKeys(diagnosticMessages);
Expand All@@ -44,7 +44,7 @@ function main(): void {
function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosticMessageTable) {
 const originalMessageForCode: string[] = [];
 let numConflicts = 0;

 for (const currentMessage of messages) {
 const code = diagnosticTable[currentMessage].code;

Expand All@@ -68,19 +68,19 @@ function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosti
 }
}

function buildUniqueNameMap(names: string[]): ts.Map<string, string> {
 var nameMap = ts.createMap<string, string>();
function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var nameMap = ts.createMap<string>();

 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

 for (var i = 0; i < names.length; i++) {
 nameMap.set(names[i], uniqueNames[i]);
 nameMap[names[i]] = uniqueNames[i];
 }

 return nameMap;
}

function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '// <auto-generated />\r\n' +
 '/// <reference path="types.ts" />\r\n' +
Expand All@@ -91,7 +91,7 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result +=
 ' ' + propName +
Expand All@@ -107,14 +107,14 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 return result;
}

function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '{';
 var names = Utilities.getObjectKeys(messageTable);
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result += '\r\n "' + createKey(propName, diagnosticDetails.code) + '"' + ' : "' + name.replace(/[\"]/g, '\\"') + '"';
 if (i !== names.length - 1) {
Expand Down

44 changes: 22 additions & 22 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,7 @@ namespace ts {

 let symbolCount = 0;
 let Symbol: { new (flags: SymbolFlags, name: string): Symbol };
 let classifiableNames: Set<string>;
 let classifiableNames: Map<string>;

 const unreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
 const reportedUnreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
Expand All@@ -147,7 +147,7 @@ namespace ts {
 options = opts;
 languageVersion = getEmitScriptTarget(options);
 inStrictMode = bindInStrictMode(file, opts);
 classifiableNames = createSet();
 classifiableNames = createMap<string>();
 symbolCount = 0;
 skipTransformFlagAggregation = isDeclarationFile(file);

Expand DownExpand Up@@ -207,11 +207,11 @@ namespace ts {
 symbol.declarations.push(node);

 if (symbolFlags & SymbolFlags.HasExports && !symbol.exports) {
 symbol.exports = createMap<string, Symbol>();
 symbol.exports = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.HasMembers && !symbol.members) {
 symbol.members = createMap<string, Symbol>();
 symbol.members = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.Value) {
Expand DownExpand Up@@ -349,17 +349,17 @@ namespace ts {
 // Otherwise, we'll be merging into a compatible existing symbol (for example when
 // you have multiple 'vars' with the same name in the same container). In this case
 // just add this node into the declarations list of the symbol.
 symbol = getOrUpdate(symbolTable, name, name => createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));

 if (name && (includes & SymbolFlags.Classifiable)) {
 classifiableNames.add(name);
 classifiableNames[name] = name;
 }

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
 symbol = setAndReturn(symbolTable, name, createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -484,7 +484,7 @@ namespace ts {
 if (containerFlags & ContainerFlags.IsContainer) {
 container = blockScopeContainer = node;
 if (containerFlags & ContainerFlags.HasLocals) {
 container.locals = createMap<string, Symbol>();
 container.locals = createMap<Symbol>();
 }
 addToContainerChain(container);
 }
Expand DownExpand Up@@ -1525,7 +1525,8 @@ namespace ts {

 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap([[symbol.name, symbol]]);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand All@@ -1535,7 +1536,7 @@ namespace ts {
 }

 if (inStrictMode) {
 const seen = createMap<string, ElementKind>();
 const seen = createMap<ElementKind>();

 for (const prop of node.properties) {
 if (prop.name.kind !== SyntaxKind.Identifier) {
Expand All@@ -1556,9 +1557,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

 const existingKind = seen.get(identifier.text);
 const existingKind = seen[identifier.text];
 if (!existingKind) {
 seen.set(identifier.text, currentKind);
 seen[identifier.text] = currentKind;
 continue;
 }

Expand DownExpand Up@@ -1591,7 +1592,7 @@ namespace ts {
 // fall through.
 default:
 if (!blockScopeContainer.locals) {
 blockScopeContainer.locals = createMap<string, Symbol>();
 blockScopeContainer.locals = createMap<Symbol>();
 addToContainerChain(blockScopeContainer);
 }
 declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
Expand DownExpand Up@@ -2071,7 +2072,7 @@ namespace ts {
 }
 }

 file.symbol.globalExports = file.symbol.globalExports || createMap<string, Symbol>();
 file.symbol.globalExports = file.symbol.globalExports || createMap<Symbol>();
 declareSymbol(file.symbol.globalExports, file.symbol, node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
 }

Expand DownExpand Up@@ -2118,7 +2119,7 @@ namespace ts {
 Debug.assert(isInJavaScriptFile(node));
 // Declare a 'member' if the container is an ES5 class or ES6 constructor
 if (container.kind === SyntaxKind.FunctionDeclaration || container.kind === SyntaxKind.FunctionExpression) {
 container.symbol.members = container.symbol.members || createMap<string, Symbol>();
 container.symbol.members = container.symbol.members || createMap<Symbol>();
 // It's acceptable for multiple 'this' assignments of the same identifier to occur
 declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property);
 }
Expand DownExpand Up@@ -2150,14 +2151,14 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals.get(constructorFunction.text);
 const funcSymbol = container.locals[constructorFunction.text];
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }

 // Set up the members collection if it doesn't exist already
 if (!funcSymbol.members) {
 funcSymbol.members = createMap<string, Symbol>();
 funcSymbol.members = createMap<Symbol>();
 }

 // Declare the method/property
Expand DownExpand Up@@ -2190,7 +2191,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames.add(node.name.text);
 classifiableNames[node.name.text] = node.name.text;
 }
 }

Expand All@@ -2206,15 +2207,14 @@ namespace ts {
 // module might have an exported variable called 'prototype'. We can't allow that as
 // that would clash with the built-in 'prototype' for the class.
 const prototypeSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Prototype, "prototype");
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (symbol.exports[prototypeSymbol.name]) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0],
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports.set(prototypeSymbol.name, prototypeSymbol);
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 prototypeSymbol.parent = symbol;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Revert "Merge pull request #11354 from Microsoft/map4"#11908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged


1 commit merged into

from

Oct 27, 2016
 Merged


Revert "Merge pull request #11354 from Microsoft/map4"
#11908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 0 additions & 2 deletions
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,6 @@ function measure(marker) {
}

var compilerSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand DownExpand Up@@ -94,7 +93,6 @@ var compilerSources = [
});

var servicesSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand Down

18 changes: 9 additions & 9 deletions
scripts/processDiagnosticMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function main(): void {

 var inputFilePath = sys.args[0].replace(/\\/g, "/");
 var inputStr = sys.readFile(inputFilePath);

 var diagnosticMessages: InputDiagnosticMessageTable = JSON.parse(inputStr);

 var names = Utilities.getObjectKeys(diagnosticMessages);
Expand All@@ -44,7 +44,7 @@ function main(): void {
function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosticMessageTable) {
 const originalMessageForCode: string[] = [];
 let numConflicts = 0;

 for (const currentMessage of messages) {
 const code = diagnosticTable[currentMessage].code;

Expand All@@ -68,19 +68,19 @@ function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosti
 }
}

function buildUniqueNameMap(names: string[]): ts.Map<string, string> {
 var nameMap = ts.createMap<string, string>();
function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var nameMap = ts.createMap<string>();

 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

 for (var i = 0; i < names.length; i++) {
 nameMap.set(names[i], uniqueNames[i]);
 nameMap[names[i]] = uniqueNames[i];
 }

 return nameMap;
}

function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '// <auto-generated />\r\n' +
 '/// <reference path="types.ts" />\r\n' +
Expand All@@ -91,7 +91,7 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result +=
 ' ' + propName +
Expand All@@ -107,14 +107,14 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 return result;
}

function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '{';
 var names = Utilities.getObjectKeys(messageTable);
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result += '\r\n "' + createKey(propName, diagnosticDetails.code) + '"' + ' : "' + name.replace(/[\"]/g, '\\"') + '"';
 if (i !== names.length - 1) {
Expand Down

44 changes: 22 additions & 22 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,7 @@ namespace ts {

 let symbolCount = 0;
 let Symbol: { new (flags: SymbolFlags, name: string): Symbol };
 let classifiableNames: Set<string>;
 let classifiableNames: Map<string>;

 const unreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
 const reportedUnreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
Expand All@@ -147,7 +147,7 @@ namespace ts {
 options = opts;
 languageVersion = getEmitScriptTarget(options);
 inStrictMode = bindInStrictMode(file, opts);
 classifiableNames = createSet();
 classifiableNames = createMap<string>();
 symbolCount = 0;
 skipTransformFlagAggregation = isDeclarationFile(file);

Expand DownExpand Up@@ -207,11 +207,11 @@ namespace ts {
 symbol.declarations.push(node);

 if (symbolFlags & SymbolFlags.HasExports && !symbol.exports) {
 symbol.exports = createMap<string, Symbol>();
 symbol.exports = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.HasMembers && !symbol.members) {
 symbol.members = createMap<string, Symbol>();
 symbol.members = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.Value) {
Expand DownExpand Up@@ -349,17 +349,17 @@ namespace ts {
 // Otherwise, we'll be merging into a compatible existing symbol (for example when
 // you have multiple 'vars' with the same name in the same container). In this case
 // just add this node into the declarations list of the symbol.
 symbol = getOrUpdate(symbolTable, name, name => createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));

 if (name && (includes & SymbolFlags.Classifiable)) {
 classifiableNames.add(name);
 classifiableNames[name] = name;
 }

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
 symbol = setAndReturn(symbolTable, name, createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -484,7 +484,7 @@ namespace ts {
 if (containerFlags & ContainerFlags.IsContainer) {
 container = blockScopeContainer = node;
 if (containerFlags & ContainerFlags.HasLocals) {
 container.locals = createMap<string, Symbol>();
 container.locals = createMap<Symbol>();
 }
 addToContainerChain(container);
 }
Expand DownExpand Up@@ -1525,7 +1525,8 @@ namespace ts {

 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap([[symbol.name, symbol]]);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand All@@ -1535,7 +1536,7 @@ namespace ts {
 }

 if (inStrictMode) {
 const seen = createMap<string, ElementKind>();
 const seen = createMap<ElementKind>();

 for (const prop of node.properties) {
 if (prop.name.kind !== SyntaxKind.Identifier) {
Expand All@@ -1556,9 +1557,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

 const existingKind = seen.get(identifier.text);
 const existingKind = seen[identifier.text];
 if (!existingKind) {
 seen.set(identifier.text, currentKind);
 seen[identifier.text] = currentKind;
 continue;
 }

Expand DownExpand Up@@ -1591,7 +1592,7 @@ namespace ts {
 // fall through.
 default:
 if (!blockScopeContainer.locals) {
 blockScopeContainer.locals = createMap<string, Symbol>();
 blockScopeContainer.locals = createMap<Symbol>();
 addToContainerChain(blockScopeContainer);
 }
 declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
Expand DownExpand Up@@ -2071,7 +2072,7 @@ namespace ts {
 }
 }

 file.symbol.globalExports = file.symbol.globalExports || createMap<string, Symbol>();
 file.symbol.globalExports = file.symbol.globalExports || createMap<Symbol>();
 declareSymbol(file.symbol.globalExports, file.symbol, node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
 }

Expand DownExpand Up@@ -2118,7 +2119,7 @@ namespace ts {
 Debug.assert(isInJavaScriptFile(node));
 // Declare a 'member' if the container is an ES5 class or ES6 constructor
 if (container.kind === SyntaxKind.FunctionDeclaration || container.kind === SyntaxKind.FunctionExpression) {
 container.symbol.members = container.symbol.members || createMap<string, Symbol>();
 container.symbol.members = container.symbol.members || createMap<Symbol>();
 // It's acceptable for multiple 'this' assignments of the same identifier to occur
 declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property);
 }
Expand DownExpand Up@@ -2150,14 +2151,14 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals.get(constructorFunction.text);
 const funcSymbol = container.locals[constructorFunction.text];
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }

 // Set up the members collection if it doesn't exist already
 if (!funcSymbol.members) {
 funcSymbol.members = createMap<string, Symbol>();
 funcSymbol.members = createMap<Symbol>();
 }

 // Declare the method/property
Expand DownExpand Up@@ -2190,7 +2191,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames.add(node.name.text);
 classifiableNames[node.name.text] = node.name.text;
 }
 }

Expand All@@ -2206,15 +2207,14 @@ namespace ts {
 // module might have an exported variable called 'prototype'. We can't allow that as
 // that would clash with the built-in 'prototype' for the class.
 const prototypeSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Prototype, "prototype");
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (symbol.exports[prototypeSymbol.name]) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0],
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports.set(prototypeSymbol.name, prototypeSymbol);
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 prototypeSymbol.parent = symbol;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Revert "Merge pull request #11354 from Microsoft/map4"#11908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged


1 commit merged into

from

Oct 27, 2016
 Merged


Revert "Merge pull request #11354 from Microsoft/map4"
#11908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 0 additions & 2 deletions
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,6 @@ function measure(marker) {
}

var compilerSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand DownExpand Up@@ -94,7 +93,6 @@ var compilerSources = [
});

var servicesSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand Down

18 changes: 9 additions & 9 deletions
scripts/processDiagnosticMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function main(): void {

 var inputFilePath = sys.args[0].replace(/\\/g, "/");
 var inputStr = sys.readFile(inputFilePath);

 var diagnosticMessages: InputDiagnosticMessageTable = JSON.parse(inputStr);

 var names = Utilities.getObjectKeys(diagnosticMessages);
Expand All@@ -44,7 +44,7 @@ function main(): void {
function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosticMessageTable) {
 const originalMessageForCode: string[] = [];
 let numConflicts = 0;

 for (const currentMessage of messages) {
 const code = diagnosticTable[currentMessage].code;

Expand All@@ -68,19 +68,19 @@ function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosti
 }
}

function buildUniqueNameMap(names: string[]): ts.Map<string, string> {
 var nameMap = ts.createMap<string, string>();
function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var nameMap = ts.createMap<string>();

 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

 for (var i = 0; i < names.length; i++) {
 nameMap.set(names[i], uniqueNames[i]);
 nameMap[names[i]] = uniqueNames[i];
 }

 return nameMap;
}

function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '// <auto-generated />\r\n' +
 '/// <reference path="types.ts" />\r\n' +
Expand All@@ -91,7 +91,7 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result +=
 ' ' + propName +
Expand All@@ -107,14 +107,14 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 return result;
}

function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '{';
 var names = Utilities.getObjectKeys(messageTable);
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result += '\r\n "' + createKey(propName, diagnosticDetails.code) + '"' + ' : "' + name.replace(/[\"]/g, '\\"') + '"';
 if (i !== names.length - 1) {
Expand Down

44 changes: 22 additions & 22 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,7 @@ namespace ts {

 let symbolCount = 0;
 let Symbol: { new (flags: SymbolFlags, name: string): Symbol };
 let classifiableNames: Set<string>;
 let classifiableNames: Map<string>;

 const unreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
 const reportedUnreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
Expand All@@ -147,7 +147,7 @@ namespace ts {
 options = opts;
 languageVersion = getEmitScriptTarget(options);
 inStrictMode = bindInStrictMode(file, opts);
 classifiableNames = createSet();
 classifiableNames = createMap<string>();
 symbolCount = 0;
 skipTransformFlagAggregation = isDeclarationFile(file);

Expand DownExpand Up@@ -207,11 +207,11 @@ namespace ts {
 symbol.declarations.push(node);

 if (symbolFlags & SymbolFlags.HasExports && !symbol.exports) {
 symbol.exports = createMap<string, Symbol>();
 symbol.exports = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.HasMembers && !symbol.members) {
 symbol.members = createMap<string, Symbol>();
 symbol.members = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.Value) {
Expand DownExpand Up@@ -349,17 +349,17 @@ namespace ts {
 // Otherwise, we'll be merging into a compatible existing symbol (for example when
 // you have multiple 'vars' with the same name in the same container). In this case
 // just add this node into the declarations list of the symbol.
 symbol = getOrUpdate(symbolTable, name, name => createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));

 if (name && (includes & SymbolFlags.Classifiable)) {
 classifiableNames.add(name);
 classifiableNames[name] = name;
 }

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
 symbol = setAndReturn(symbolTable, name, createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -484,7 +484,7 @@ namespace ts {
 if (containerFlags & ContainerFlags.IsContainer) {
 container = blockScopeContainer = node;
 if (containerFlags & ContainerFlags.HasLocals) {
 container.locals = createMap<string, Symbol>();
 container.locals = createMap<Symbol>();
 }
 addToContainerChain(container);
 }
Expand DownExpand Up@@ -1525,7 +1525,8 @@ namespace ts {

 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap([[symbol.name, symbol]]);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand All@@ -1535,7 +1536,7 @@ namespace ts {
 }

 if (inStrictMode) {
 const seen = createMap<string, ElementKind>();
 const seen = createMap<ElementKind>();

 for (const prop of node.properties) {
 if (prop.name.kind !== SyntaxKind.Identifier) {
Expand All@@ -1556,9 +1557,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

 const existingKind = seen.get(identifier.text);
 const existingKind = seen[identifier.text];
 if (!existingKind) {
 seen.set(identifier.text, currentKind);
 seen[identifier.text] = currentKind;
 continue;
 }

Expand DownExpand Up@@ -1591,7 +1592,7 @@ namespace ts {
 // fall through.
 default:
 if (!blockScopeContainer.locals) {
 blockScopeContainer.locals = createMap<string, Symbol>();
 blockScopeContainer.locals = createMap<Symbol>();
 addToContainerChain(blockScopeContainer);
 }
 declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
Expand DownExpand Up@@ -2071,7 +2072,7 @@ namespace ts {
 }
 }

 file.symbol.globalExports = file.symbol.globalExports || createMap<string, Symbol>();
 file.symbol.globalExports = file.symbol.globalExports || createMap<Symbol>();
 declareSymbol(file.symbol.globalExports, file.symbol, node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
 }

Expand DownExpand Up@@ -2118,7 +2119,7 @@ namespace ts {
 Debug.assert(isInJavaScriptFile(node));
 // Declare a 'member' if the container is an ES5 class or ES6 constructor
 if (container.kind === SyntaxKind.FunctionDeclaration || container.kind === SyntaxKind.FunctionExpression) {
 container.symbol.members = container.symbol.members || createMap<string, Symbol>();
 container.symbol.members = container.symbol.members || createMap<Symbol>();
 // It's acceptable for multiple 'this' assignments of the same identifier to occur
 declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property);
 }
Expand DownExpand Up@@ -2150,14 +2151,14 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals.get(constructorFunction.text);
 const funcSymbol = container.locals[constructorFunction.text];
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }

 // Set up the members collection if it doesn't exist already
 if (!funcSymbol.members) {
 funcSymbol.members = createMap<string, Symbol>();
 funcSymbol.members = createMap<Symbol>();
 }

 // Declare the method/property
Expand DownExpand Up@@ -2190,7 +2191,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames.add(node.name.text);
 classifiableNames[node.name.text] = node.name.text;
 }
 }

Expand All@@ -2206,15 +2207,14 @@ namespace ts {
 // module might have an exported variable called 'prototype'. We can't allow that as
 // that would clash with the built-in 'prototype' for the class.
 const prototypeSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Prototype, "prototype");
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (symbol.exports[prototypeSymbol.name]) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0],
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports.set(prototypeSymbol.name, prototypeSymbol);
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 prototypeSymbol.parent = symbol;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Revert "Merge pull request #11354 from Microsoft/map4"#11908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged


1 commit merged into

from

Oct 27, 2016
 Merged


Revert "Merge pull request #11354 from Microsoft/map4"
#11908
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 0 additions & 2 deletions
Jakefile.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,6 @@ function measure(marker) {
}

var compilerSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand DownExpand Up@@ -94,7 +93,6 @@ var compilerSources = [
});

var servicesSources = [
 "collections.ts",
 "core.ts",
 "performance.ts",
 "sys.ts",
Expand Down

18 changes: 9 additions & 9 deletions
scripts/processDiagnosticMessages.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ function main(): void {

 var inputFilePath = sys.args[0].replace(/\\/g, "/");
 var inputStr = sys.readFile(inputFilePath);

 var diagnosticMessages: InputDiagnosticMessageTable = JSON.parse(inputStr);

 var names = Utilities.getObjectKeys(diagnosticMessages);
Expand All@@ -44,7 +44,7 @@ function main(): void {
function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosticMessageTable) {
 const originalMessageForCode: string[] = [];
 let numConflicts = 0;

 for (const currentMessage of messages) {
 const code = diagnosticTable[currentMessage].code;

Expand All@@ -68,19 +68,19 @@ function checkForUniqueCodes(messages: string[], diagnosticTable: InputDiagnosti
 }
}

function buildUniqueNameMap(names: string[]): ts.Map<string, string> {
 var nameMap = ts.createMap<string, string>();
function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var nameMap = ts.createMap<string>();

 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

 for (var i = 0; i < names.length; i++) {
 nameMap.set(names[i], uniqueNames[i]);
 nameMap[names[i]] = uniqueNames[i];
 }

 return nameMap;
}

function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '// <auto-generated />\r\n' +
 '/// <reference path="types.ts" />\r\n' +
Expand All@@ -91,7 +91,7 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result +=
 ' ' + propName +
Expand All@@ -107,14 +107,14 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
 return result;
}

function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string, string>): string {
function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable, nameMap: ts.Map<string>): string {
 var result =
 '{';
 var names = Utilities.getObjectKeys(messageTable);
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap.get(name));
 var propName = convertPropertyName(nameMap[name]);

 result += '\r\n "' + createKey(propName, diagnosticDetails.code) + '"' + ' : "' + name.replace(/[\"]/g, '\\"') + '"';
 if (i !== names.length - 1) {
Expand Down

44 changes: 22 additions & 22 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -133,7 +133,7 @@ namespace ts {

 let symbolCount = 0;
 let Symbol: { new (flags: SymbolFlags, name: string): Symbol };
 let classifiableNames: Set<string>;
 let classifiableNames: Map<string>;

 const unreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
 const reportedUnreachableFlow: FlowNode = { flags: FlowFlags.Unreachable };
Expand All@@ -147,7 +147,7 @@ namespace ts {
 options = opts;
 languageVersion = getEmitScriptTarget(options);
 inStrictMode = bindInStrictMode(file, opts);
 classifiableNames = createSet();
 classifiableNames = createMap<string>();
 symbolCount = 0;
 skipTransformFlagAggregation = isDeclarationFile(file);

Expand DownExpand Up@@ -207,11 +207,11 @@ namespace ts {
 symbol.declarations.push(node);

 if (symbolFlags & SymbolFlags.HasExports && !symbol.exports) {
 symbol.exports = createMap<string, Symbol>();
 symbol.exports = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.HasMembers && !symbol.members) {
 symbol.members = createMap<string, Symbol>();
 symbol.members = createMap<Symbol>();
 }

 if (symbolFlags & SymbolFlags.Value) {
Expand DownExpand Up@@ -349,17 +349,17 @@ namespace ts {
 // Otherwise, we'll be merging into a compatible existing symbol (for example when
 // you have multiple 'vars' with the same name in the same container). In this case
 // just add this node into the declarations list of the symbol.
 symbol = getOrUpdate(symbolTable, name, name => createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));

 if (name && (includes & SymbolFlags.Classifiable)) {
 classifiableNames.add(name);
 classifiableNames[name] = name;
 }

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
 symbol = setAndReturn(symbolTable, name, createSymbol(SymbolFlags.None, name));
 symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -484,7 +484,7 @@ namespace ts {
 if (containerFlags & ContainerFlags.IsContainer) {
 container = blockScopeContainer = node;
 if (containerFlags & ContainerFlags.HasLocals) {
 container.locals = createMap<string, Symbol>();
 container.locals = createMap<Symbol>();
 }
 addToContainerChain(container);
 }
Expand DownExpand Up@@ -1525,7 +1525,8 @@ namespace ts {

 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap([[symbol.name, symbol]]);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand All@@ -1535,7 +1536,7 @@ namespace ts {
 }

 if (inStrictMode) {
 const seen = createMap<string, ElementKind>();
 const seen = createMap<ElementKind>();

 for (const prop of node.properties) {
 if (prop.name.kind !== SyntaxKind.Identifier) {
Expand All@@ -1556,9 +1557,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

 const existingKind = seen.get(identifier.text);
 const existingKind = seen[identifier.text];
 if (!existingKind) {
 seen.set(identifier.text, currentKind);
 seen[identifier.text] = currentKind;
 continue;
 }

Expand DownExpand Up@@ -1591,7 +1592,7 @@ namespace ts {
 // fall through.
 default:
 if (!blockScopeContainer.locals) {
 blockScopeContainer.locals = createMap<string, Symbol>();
 blockScopeContainer.locals = createMap<Symbol>();
 addToContainerChain(blockScopeContainer);
 }
 declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
Expand DownExpand Up@@ -2071,7 +2072,7 @@ namespace ts {
 }
 }

 file.symbol.globalExports = file.symbol.globalExports || createMap<string, Symbol>();
 file.symbol.globalExports = file.symbol.globalExports || createMap<Symbol>();
 declareSymbol(file.symbol.globalExports, file.symbol, node, SymbolFlags.Alias, SymbolFlags.AliasExcludes);
 }

Expand DownExpand Up@@ -2118,7 +2119,7 @@ namespace ts {
 Debug.assert(isInJavaScriptFile(node));
 // Declare a 'member' if the container is an ES5 class or ES6 constructor
 if (container.kind === SyntaxKind.FunctionDeclaration || container.kind === SyntaxKind.FunctionExpression) {
 container.symbol.members = container.symbol.members || createMap<string, Symbol>();
 container.symbol.members = container.symbol.members || createMap<Symbol>();
 // It's acceptable for multiple 'this' assignments of the same identifier to occur
 declareSymbol(container.symbol.members, container.symbol, node, SymbolFlags.Property, SymbolFlags.PropertyExcludes & ~SymbolFlags.Property);
 }
Expand DownExpand Up@@ -2150,14 +2151,14 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals.get(constructorFunction.text);
 const funcSymbol = container.locals[constructorFunction.text];
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }

 // Set up the members collection if it doesn't exist already
 if (!funcSymbol.members) {
 funcSymbol.members = createMap<string, Symbol>();
 funcSymbol.members = createMap<Symbol>();
 }

 // Declare the method/property
Expand DownExpand Up@@ -2190,7 +2191,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames.add(node.name.text);
 classifiableNames[node.name.text] = node.name.text;
 }
 }

Expand All@@ -2206,15 +2207,14 @@ namespace ts {
 // module might have an exported variable called 'prototype'. We can't allow that as
 // that would clash with the built-in 'prototype' for the class.
 const prototypeSymbol = createSymbol(SymbolFlags.Property | SymbolFlags.Prototype, "prototype");
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (symbol.exports[prototypeSymbol.name]) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0],
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports.set(prototypeSymbol.name, prototypeSymbol);
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 prototypeSymbol.parent = symbol;
 }

Expand Down
Loading