Use native maps when they're available#12715

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
30 commits merged into from
Jan 17, 2017
Merged

Use native maps when they're available #12715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6b1cc89
Use native maps when they're available
Dec 5, 2016
b15ffda
Simplify forEachKeyInMap and someKeyInMap
Dec 8, 2016
863e4d6
Clean up helpers
Dec 8, 2016
8121de7
Fix target error for gulp
Dec 8, 2016
8dbb8e7
Add comment
Dec 8, 2016
55fc62b
Merge branch 'master' into map5
Dec 12, 2016
5c304d0
Remove `createObject`; use `Object.create` directly.
Dec 12, 2016
b53b5cf
Remove the "set" function and use `map.set` with multiple lines of co…
Dec 12, 2016
8386d49
Use sparse arrays for number-keyed maps
Dec 27, 2016
5555258
Add iterators to Map interface, and shim iterators
Dec 27, 2016
3d7b5e6
Make `createMapLike` private and rename to `createDictionaryObject`
Dec 27, 2016
9e33585
Merge branch 'master' into map5
Dec 27, 2016
f510897
Remove "sparseArray" constructor function and just use array literals
Dec 28, 2016
39c19a7
Inline `keysOfMap` and `valuesOfMap`.
Dec 28, 2016
932eaa3
Rename and consolidate map iteration helpers
Dec 28, 2016
145f0b2
Add `createMultiMap` to replace `multiMapAdd` and `multiMapRemove`
Dec 28, 2016
346a865
Merge branch 'master' into map5
Dec 28, 2016
2e6f369
Replace SparseArray<T> with T[]
Dec 28, 2016
a677712
Merge branch 'master' into map5
Dec 29, 2016
8c5afd7
Merge branch 'master' into map5
Jan 6, 2017
9221336
Fix name: `mapEntries` is more accurate
Jan 6, 2017
c28d98a
Fix test
Jan 9, 2017
a0641b2
Merge branch 'master' into map5
Jan 9, 2017
f0e1fd9
Merge branch 'master' into map5
Jan 11, 2017
37e18d9
Add `createMapFromTemplate` helper
Jan 11, 2017
30462e1
Merge branch 'master' into map5
Jan 11, 2017
b98e82e
Fix one more use of `createMapFromTemplate`
Jan 12, 2017
113338c
Merge branch 'master' into map5
Jan 12, 2017
6b6c34b
Fix typo
Jan 12, 2017
30ccc7a
Merge branch 'master' into map5
Jan 17, 2017
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
1 change: 1 addition & 0 deletions Gulpfile.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,7 @@ const builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "dia
// processDiagnosticMessages script
gulp.task(processDiagnosticMessagesJs, false, [], () => {
const settings: tsc.Settings = getCompilerSettings({
target: "es5",
declaration: false,
removeComments: true,
noResolve: false,
Expand Down
10 changes: 5 additions & 5 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 DownExpand Up@@ -74,7 +74,7 @@ function buildUniqueNameMap(names: string[]): ts.Map<string> {
var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

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

return nameMap;
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[name]);
var propName = convertPropertyName(nameMap.get(name));

result +=
' ' + propName +
Expand All@@ -114,7 +114,7 @@ function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable,
for (var i = 0; i < names.length; i++) {
var name = names[i];
var diagnosticDetails = messageTable[name];
var propName = convertPropertyName(nameMap[name]);
var propName = convertPropertyName(nameMap.get(name));

result += '\r\n "' + createKey(propName, diagnosticDetails.code) + '"' + ' : "' + name.replace(/[\"]/g, '\\"') + '"';
if (i !== names.length - 1) {
Expand Down
27 changes: 15 additions & 12 deletions src/compiler/binder.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -349,17 +349,20 @@ 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 = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));
symbol = symbolTable.get(name);
if (!symbol) {
symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
}

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

if (symbol.flags & excludes) {
if (symbol.isReplaceableByMethod) {
// Javascript constructor-declared symbols can be discarded in favor of
// prototype symbols like methods.
symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
}
else {
if (node.name) {
Expand DownExpand Up@@ -1570,7 +1573,7 @@ namespace ts {
const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
typeLiteralSymbol.members = createMap<Symbol>();
typeLiteralSymbol.members[symbol.name] = symbol;
typeLiteralSymbol.members.set(symbol.name, symbol);
}

function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand DownExpand Up@@ -1601,9 +1604,9 @@ namespace ts {
? ElementKind.Property
: ElementKind.Accessor;

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

Expand DownExpand Up@@ -2208,7 +2211,7 @@ namespace ts {
constructorFunction.parent = classPrototype;
classPrototype.parent = leftSideOfAssignment;

const funcSymbol = container.locals[constructorFunction.text];
const funcSymbol = container.locals.get(constructorFunction.text);
if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
return;
}
Expand DownExpand Up@@ -2239,7 +2242,7 @@ namespace ts {
bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
// Add name of class expression into the map for semantic classifier
if (node.name) {
classifiableNames[node.name.text] = node.name.text;
classifiableNames.set(node.name.text, node.name.text);
}
}

Expand All@@ -2255,14 +2258,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");
if (symbol.exports[prototypeSymbol.name]) {
const symbolExport = symbol.exports.get(prototypeSymbol.name);
if (symbolExport) {
if (node.name) {
node.name.parent = node;
}
file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0], Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
}
symbol.exports[prototypeSymbol.name] = prototypeSymbol;
symbol.exports.set(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
Use native maps when they're available#12715

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


30 commits merged into

from

Jan 17, 2017
 Merged


Use native maps when they're available
#12715
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


30 commits


Select commit
Hold shift + click to select a range
6b1cc89

Use native maps when they're available

Dec 5, 2016
b15ffda

Simplify forEachKeyInMap and someKeyInMap

Dec 8, 2016
863e4d6

Clean up helpers

Dec 8, 2016
8121de7

Fix target error for gulp

Dec 8, 2016
8dbb8e7

Add comment

Dec 8, 2016
55fc62b

Merge branch 'master' into map5

Dec 12, 2016
5c304d0

Remove `createObject`; use `Object.create` directly.

Dec 12, 2016
b53b5cf

Remove the "set" function and use `map.set` with multiple lines of co…

Dec 12, 2016
8386d49

Use sparse arrays for number-keyed maps

Dec 27, 2016
5555258

Add iterators to Map interface, and shim iterators

Dec 27, 2016
3d7b5e6

Make `createMapLike` private and rename to `createDictionaryObject`

Dec 27, 2016
9e33585

Merge branch 'master' into map5

Dec 27, 2016
f510897

Remove "sparseArray" constructor function and just use array literals

Dec 28, 2016
39c19a7

Inline `keysOfMap` and `valuesOfMap`.

Dec 28, 2016
932eaa3

Rename and consolidate map iteration helpers

Dec 28, 2016
145f0b2

Add `createMultiMap` to replace `multiMapAdd` and `multiMapRemove`

Dec 28, 2016
346a865

Merge branch 'master' into map5

Dec 28, 2016
2e6f369

Replace SparseArray<T> with T[]

Dec 28, 2016
a677712

Merge branch 'master' into map5

Dec 29, 2016
8c5afd7

Merge branch 'master' into map5

Jan 6, 2017
9221336

Fix name: `mapEntries` is more accurate

Jan 6, 2017
c28d98a

Fix test

Jan 9, 2017
a0641b2

Merge branch 'master' into map5

Jan 9, 2017
f0e1fd9

Merge branch 'master' into map5

Jan 11, 2017
37e18d9

Add `createMapFromTemplate` helper

Jan 11, 2017
30462e1

Merge branch 'master' into map5

Jan 11, 2017
b98e82e

Fix one more use of `createMapFromTemplate`

Jan 12, 2017
113338c

Merge branch 'master' into map5

Jan 12, 2017
6b6c34b

Fix typo

Jan 12, 2017
30ccc7a

Merge branch 'master' into map5

Jan 17, 2017

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


1 change: 1 addition & 0 deletions
Gulpfile.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,7 @@ const builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "dia
// processDiagnosticMessages script
gulp.task(processDiagnosticMessagesJs, false, [], () => {
 const settings: tsc.Settings = getCompilerSettings({
 target: "es5",
 declaration: false,
 removeComments: true,
 noResolve: false,
Expand Down

10 changes: 5 additions & 5 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 DownExpand Up@@ -74,7 +74,7 @@ function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

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

 return nameMap;
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[name]);
 var propName = convertPropertyName(nameMap.get(name));

 result +=
 ' ' + propName +
Expand All@@ -114,7 +114,7 @@ function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable,
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap[name]);
 var propName = convertPropertyName(nameMap.get(name));

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

27 changes: 15 additions & 12 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,17 +349,20 @@ 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 = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));
 symbol = symbolTable.get(name);
 if (!symbol) {
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }

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

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -1570,7 +1573,7 @@ namespace ts {
 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 typeLiteralSymbol.members.set(symbol.name, symbol);
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand DownExpand Up@@ -1601,9 +1604,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

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

Expand DownExpand Up@@ -2208,7 +2211,7 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals[constructorFunction.text];
 const funcSymbol = container.locals.get(constructorFunction.text);
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }
Expand DownExpand Up@@ -2239,7 +2242,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames[node.name.text] = node.name.text;
 classifiableNames.set(node.name.text, node.name.text);
 }
 }

Expand All@@ -2255,14 +2258,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");
 if (symbol.exports[prototypeSymbol.name]) {
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0], Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 symbol.exports.set(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
Use native maps when they're available#12715

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


30 commits merged into

from

Jan 17, 2017
 Merged


Use native maps when they're available
#12715
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


30 commits


Select commit
Hold shift + click to select a range
6b1cc89

Use native maps when they're available

Dec 5, 2016
b15ffda

Simplify forEachKeyInMap and someKeyInMap

Dec 8, 2016
863e4d6

Clean up helpers

Dec 8, 2016
8121de7

Fix target error for gulp

Dec 8, 2016
8dbb8e7

Add comment

Dec 8, 2016
55fc62b

Merge branch 'master' into map5

Dec 12, 2016
5c304d0

Remove `createObject`; use `Object.create` directly.

Dec 12, 2016
b53b5cf

Remove the "set" function and use `map.set` with multiple lines of co…

Dec 12, 2016
8386d49

Use sparse arrays for number-keyed maps

Dec 27, 2016
5555258

Add iterators to Map interface, and shim iterators

Dec 27, 2016
3d7b5e6

Make `createMapLike` private and rename to `createDictionaryObject`

Dec 27, 2016
9e33585

Merge branch 'master' into map5

Dec 27, 2016
f510897

Remove "sparseArray" constructor function and just use array literals

Dec 28, 2016
39c19a7

Inline `keysOfMap` and `valuesOfMap`.

Dec 28, 2016
932eaa3

Rename and consolidate map iteration helpers

Dec 28, 2016
145f0b2

Add `createMultiMap` to replace `multiMapAdd` and `multiMapRemove`

Dec 28, 2016
346a865

Merge branch 'master' into map5

Dec 28, 2016
2e6f369

Replace SparseArray<T> with T[]

Dec 28, 2016
a677712

Merge branch 'master' into map5

Dec 29, 2016
8c5afd7

Merge branch 'master' into map5

Jan 6, 2017
9221336

Fix name: `mapEntries` is more accurate

Jan 6, 2017
c28d98a

Fix test

Jan 9, 2017
a0641b2

Merge branch 'master' into map5

Jan 9, 2017
f0e1fd9

Merge branch 'master' into map5

Jan 11, 2017
37e18d9

Add `createMapFromTemplate` helper

Jan 11, 2017
30462e1

Merge branch 'master' into map5

Jan 11, 2017
b98e82e

Fix one more use of `createMapFromTemplate`

Jan 12, 2017
113338c

Merge branch 'master' into map5

Jan 12, 2017
6b6c34b

Fix typo

Jan 12, 2017
30ccc7a

Merge branch 'master' into map5

Jan 17, 2017

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


1 change: 1 addition & 0 deletions
Gulpfile.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,7 @@ const builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "dia
// processDiagnosticMessages script
gulp.task(processDiagnosticMessagesJs, false, [], () => {
 const settings: tsc.Settings = getCompilerSettings({
 target: "es5",
 declaration: false,
 removeComments: true,
 noResolve: false,
Expand Down

10 changes: 5 additions & 5 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 DownExpand Up@@ -74,7 +74,7 @@ function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

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

 return nameMap;
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[name]);
 var propName = convertPropertyName(nameMap.get(name));

 result +=
 ' ' + propName +
Expand All@@ -114,7 +114,7 @@ function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable,
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap[name]);
 var propName = convertPropertyName(nameMap.get(name));

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

27 changes: 15 additions & 12 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,17 +349,20 @@ 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 = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));
 symbol = symbolTable.get(name);
 if (!symbol) {
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }

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

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -1570,7 +1573,7 @@ namespace ts {
 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 typeLiteralSymbol.members.set(symbol.name, symbol);
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand DownExpand Up@@ -1601,9 +1604,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

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

Expand DownExpand Up@@ -2208,7 +2211,7 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals[constructorFunction.text];
 const funcSymbol = container.locals.get(constructorFunction.text);
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }
Expand DownExpand Up@@ -2239,7 +2242,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames[node.name.text] = node.name.text;
 classifiableNames.set(node.name.text, node.name.text);
 }
 }

Expand All@@ -2255,14 +2258,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");
 if (symbol.exports[prototypeSymbol.name]) {
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0], Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 symbol.exports.set(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
Use native maps when they're available#12715

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


30 commits merged into

from

Jan 17, 2017
 Merged


Use native maps when they're available
#12715
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


30 commits


Select commit
Hold shift + click to select a range
6b1cc89

Use native maps when they're available

Dec 5, 2016
b15ffda

Simplify forEachKeyInMap and someKeyInMap

Dec 8, 2016
863e4d6

Clean up helpers

Dec 8, 2016
8121de7

Fix target error for gulp

Dec 8, 2016
8dbb8e7

Add comment

Dec 8, 2016
55fc62b

Merge branch 'master' into map5

Dec 12, 2016
5c304d0

Remove `createObject`; use `Object.create` directly.

Dec 12, 2016
b53b5cf

Remove the "set" function and use `map.set` with multiple lines of co…

Dec 12, 2016
8386d49

Use sparse arrays for number-keyed maps

Dec 27, 2016
5555258

Add iterators to Map interface, and shim iterators

Dec 27, 2016
3d7b5e6

Make `createMapLike` private and rename to `createDictionaryObject`

Dec 27, 2016
9e33585

Merge branch 'master' into map5

Dec 27, 2016
f510897

Remove "sparseArray" constructor function and just use array literals

Dec 28, 2016
39c19a7

Inline `keysOfMap` and `valuesOfMap`.

Dec 28, 2016
932eaa3

Rename and consolidate map iteration helpers

Dec 28, 2016
145f0b2

Add `createMultiMap` to replace `multiMapAdd` and `multiMapRemove`

Dec 28, 2016
346a865

Merge branch 'master' into map5

Dec 28, 2016
2e6f369

Replace SparseArray<T> with T[]

Dec 28, 2016
a677712

Merge branch 'master' into map5

Dec 29, 2016
8c5afd7

Merge branch 'master' into map5

Jan 6, 2017
9221336

Fix name: `mapEntries` is more accurate

Jan 6, 2017
c28d98a

Fix test

Jan 9, 2017
a0641b2

Merge branch 'master' into map5

Jan 9, 2017
f0e1fd9

Merge branch 'master' into map5

Jan 11, 2017
37e18d9

Add `createMapFromTemplate` helper

Jan 11, 2017
30462e1

Merge branch 'master' into map5

Jan 11, 2017
b98e82e

Fix one more use of `createMapFromTemplate`

Jan 12, 2017
113338c

Merge branch 'master' into map5

Jan 12, 2017
6b6c34b

Fix typo

Jan 12, 2017
30ccc7a

Merge branch 'master' into map5

Jan 17, 2017

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


1 change: 1 addition & 0 deletions
Gulpfile.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,7 @@ const builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "dia
// processDiagnosticMessages script
gulp.task(processDiagnosticMessagesJs, false, [], () => {
 const settings: tsc.Settings = getCompilerSettings({
 target: "es5",
 declaration: false,
 removeComments: true,
 noResolve: false,
Expand Down

10 changes: 5 additions & 5 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 DownExpand Up@@ -74,7 +74,7 @@ function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

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

 return nameMap;
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[name]);
 var propName = convertPropertyName(nameMap.get(name));

 result +=
 ' ' + propName +
Expand All@@ -114,7 +114,7 @@ function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable,
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap[name]);
 var propName = convertPropertyName(nameMap.get(name));

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

27 changes: 15 additions & 12 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,17 +349,20 @@ 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 = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));
 symbol = symbolTable.get(name);
 if (!symbol) {
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }

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

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -1570,7 +1573,7 @@ namespace ts {
 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 typeLiteralSymbol.members.set(symbol.name, symbol);
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand DownExpand Up@@ -1601,9 +1604,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

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

Expand DownExpand Up@@ -2208,7 +2211,7 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals[constructorFunction.text];
 const funcSymbol = container.locals.get(constructorFunction.text);
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }
Expand DownExpand Up@@ -2239,7 +2242,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames[node.name.text] = node.name.text;
 classifiableNames.set(node.name.text, node.name.text);
 }
 }

Expand All@@ -2255,14 +2258,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");
 if (symbol.exports[prototypeSymbol.name]) {
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0], Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 symbol.exports.set(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
Use native maps when they're available#12715

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


30 commits merged into

from

Jan 17, 2017
 Merged


Use native maps when they're available
#12715
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


30 commits


Select commit
Hold shift + click to select a range
6b1cc89

Use native maps when they're available

Dec 5, 2016
b15ffda

Simplify forEachKeyInMap and someKeyInMap

Dec 8, 2016
863e4d6

Clean up helpers

Dec 8, 2016
8121de7

Fix target error for gulp

Dec 8, 2016
8dbb8e7

Add comment

Dec 8, 2016
55fc62b

Merge branch 'master' into map5

Dec 12, 2016
5c304d0

Remove `createObject`; use `Object.create` directly.

Dec 12, 2016
b53b5cf

Remove the "set" function and use `map.set` with multiple lines of co…

Dec 12, 2016
8386d49

Use sparse arrays for number-keyed maps

Dec 27, 2016
5555258

Add iterators to Map interface, and shim iterators

Dec 27, 2016
3d7b5e6

Make `createMapLike` private and rename to `createDictionaryObject`

Dec 27, 2016
9e33585

Merge branch 'master' into map5

Dec 27, 2016
f510897

Remove "sparseArray" constructor function and just use array literals

Dec 28, 2016
39c19a7

Inline `keysOfMap` and `valuesOfMap`.

Dec 28, 2016
932eaa3

Rename and consolidate map iteration helpers

Dec 28, 2016
145f0b2

Add `createMultiMap` to replace `multiMapAdd` and `multiMapRemove`

Dec 28, 2016
346a865

Merge branch 'master' into map5

Dec 28, 2016
2e6f369

Replace SparseArray<T> with T[]

Dec 28, 2016
a677712

Merge branch 'master' into map5

Dec 29, 2016
8c5afd7

Merge branch 'master' into map5

Jan 6, 2017
9221336

Fix name: `mapEntries` is more accurate

Jan 6, 2017
c28d98a

Fix test

Jan 9, 2017
a0641b2

Merge branch 'master' into map5

Jan 9, 2017
f0e1fd9

Merge branch 'master' into map5

Jan 11, 2017
37e18d9

Add `createMapFromTemplate` helper

Jan 11, 2017
30462e1

Merge branch 'master' into map5

Jan 11, 2017
b98e82e

Fix one more use of `createMapFromTemplate`

Jan 12, 2017
113338c

Merge branch 'master' into map5

Jan 12, 2017
6b6c34b

Fix typo

Jan 12, 2017
30ccc7a

Merge branch 'master' into map5

Jan 17, 2017

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


1 change: 1 addition & 0 deletions
Gulpfile.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,7 @@ const builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "dia
// processDiagnosticMessages script
gulp.task(processDiagnosticMessagesJs, false, [], () => {
 const settings: tsc.Settings = getCompilerSettings({
 target: "es5",
 declaration: false,
 removeComments: true,
 noResolve: false,
Expand Down

10 changes: 5 additions & 5 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 DownExpand Up@@ -74,7 +74,7 @@ function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

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

 return nameMap;
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[name]);
 var propName = convertPropertyName(nameMap.get(name));

 result +=
 ' ' + propName +
Expand All@@ -114,7 +114,7 @@ function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable,
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap[name]);
 var propName = convertPropertyName(nameMap.get(name));

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

27 changes: 15 additions & 12 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,17 +349,20 @@ 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 = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));
 symbol = symbolTable.get(name);
 if (!symbol) {
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }

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

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -1570,7 +1573,7 @@ namespace ts {
 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 typeLiteralSymbol.members.set(symbol.name, symbol);
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand DownExpand Up@@ -1601,9 +1604,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

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

Expand DownExpand Up@@ -2208,7 +2211,7 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals[constructorFunction.text];
 const funcSymbol = container.locals.get(constructorFunction.text);
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }
Expand DownExpand Up@@ -2239,7 +2242,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames[node.name.text] = node.name.text;
 classifiableNames.set(node.name.text, node.name.text);
 }
 }

Expand All@@ -2255,14 +2258,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");
 if (symbol.exports[prototypeSymbol.name]) {
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0], Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 symbol.exports.set(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
Use native maps when they're available#12715

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


30 commits merged into

from

Jan 17, 2017
 Merged


Use native maps when they're available
#12715
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


30 commits


Select commit
Hold shift + click to select a range
6b1cc89

Use native maps when they're available

Dec 5, 2016
b15ffda

Simplify forEachKeyInMap and someKeyInMap

Dec 8, 2016
863e4d6

Clean up helpers

Dec 8, 2016
8121de7

Fix target error for gulp

Dec 8, 2016
8dbb8e7

Add comment

Dec 8, 2016
55fc62b

Merge branch 'master' into map5

Dec 12, 2016
5c304d0

Remove `createObject`; use `Object.create` directly.

Dec 12, 2016
b53b5cf

Remove the "set" function and use `map.set` with multiple lines of co…

Dec 12, 2016
8386d49

Use sparse arrays for number-keyed maps

Dec 27, 2016
5555258

Add iterators to Map interface, and shim iterators

Dec 27, 2016
3d7b5e6

Make `createMapLike` private and rename to `createDictionaryObject`

Dec 27, 2016
9e33585

Merge branch 'master' into map5

Dec 27, 2016
f510897

Remove "sparseArray" constructor function and just use array literals

Dec 28, 2016
39c19a7

Inline `keysOfMap` and `valuesOfMap`.

Dec 28, 2016
932eaa3

Rename and consolidate map iteration helpers

Dec 28, 2016
145f0b2

Add `createMultiMap` to replace `multiMapAdd` and `multiMapRemove`

Dec 28, 2016
346a865

Merge branch 'master' into map5

Dec 28, 2016
2e6f369

Replace SparseArray<T> with T[]

Dec 28, 2016
a677712

Merge branch 'master' into map5

Dec 29, 2016
8c5afd7

Merge branch 'master' into map5

Jan 6, 2017
9221336

Fix name: `mapEntries` is more accurate

Jan 6, 2017
c28d98a

Fix test

Jan 9, 2017
a0641b2

Merge branch 'master' into map5

Jan 9, 2017
f0e1fd9

Merge branch 'master' into map5

Jan 11, 2017
37e18d9

Add `createMapFromTemplate` helper

Jan 11, 2017
30462e1

Merge branch 'master' into map5

Jan 11, 2017
b98e82e

Fix one more use of `createMapFromTemplate`

Jan 12, 2017
113338c

Merge branch 'master' into map5

Jan 12, 2017
6b6c34b

Fix typo

Jan 12, 2017
30ccc7a

Merge branch 'master' into map5

Jan 17, 2017

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


1 change: 1 addition & 0 deletions
Gulpfile.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,7 @@ const builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "dia
// processDiagnosticMessages script
gulp.task(processDiagnosticMessagesJs, false, [], () => {
 const settings: tsc.Settings = getCompilerSettings({
 target: "es5",
 declaration: false,
 removeComments: true,
 noResolve: false,
Expand Down

10 changes: 5 additions & 5 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 DownExpand Up@@ -74,7 +74,7 @@ function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

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

 return nameMap;
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[name]);
 var propName = convertPropertyName(nameMap.get(name));

 result +=
 ' ' + propName +
Expand All@@ -114,7 +114,7 @@ function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable,
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap[name]);
 var propName = convertPropertyName(nameMap.get(name));

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

27 changes: 15 additions & 12 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,17 +349,20 @@ 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 = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));
 symbol = symbolTable.get(name);
 if (!symbol) {
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }

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

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -1570,7 +1573,7 @@ namespace ts {
 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 typeLiteralSymbol.members.set(symbol.name, symbol);
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand DownExpand Up@@ -1601,9 +1604,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

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

Expand DownExpand Up@@ -2208,7 +2211,7 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals[constructorFunction.text];
 const funcSymbol = container.locals.get(constructorFunction.text);
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }
Expand DownExpand Up@@ -2239,7 +2242,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames[node.name.text] = node.name.text;
 classifiableNames.set(node.name.text, node.name.text);
 }
 }

Expand All@@ -2255,14 +2258,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");
 if (symbol.exports[prototypeSymbol.name]) {
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0], Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 symbol.exports.set(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
Use native maps when they're available#12715

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


30 commits merged into

from

Jan 17, 2017
 Merged


Use native maps when they're available
#12715
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


30 commits


Select commit
Hold shift + click to select a range
6b1cc89

Use native maps when they're available

Dec 5, 2016
b15ffda

Simplify forEachKeyInMap and someKeyInMap

Dec 8, 2016
863e4d6

Clean up helpers

Dec 8, 2016
8121de7

Fix target error for gulp

Dec 8, 2016
8dbb8e7

Add comment

Dec 8, 2016
55fc62b

Merge branch 'master' into map5

Dec 12, 2016
5c304d0

Remove `createObject`; use `Object.create` directly.

Dec 12, 2016
b53b5cf

Remove the "set" function and use `map.set` with multiple lines of co…

Dec 12, 2016
8386d49

Use sparse arrays for number-keyed maps

Dec 27, 2016
5555258

Add iterators to Map interface, and shim iterators

Dec 27, 2016
3d7b5e6

Make `createMapLike` private and rename to `createDictionaryObject`

Dec 27, 2016
9e33585

Merge branch 'master' into map5

Dec 27, 2016
f510897

Remove "sparseArray" constructor function and just use array literals

Dec 28, 2016
39c19a7

Inline `keysOfMap` and `valuesOfMap`.

Dec 28, 2016
932eaa3

Rename and consolidate map iteration helpers

Dec 28, 2016
145f0b2

Add `createMultiMap` to replace `multiMapAdd` and `multiMapRemove`

Dec 28, 2016
346a865

Merge branch 'master' into map5

Dec 28, 2016
2e6f369

Replace SparseArray<T> with T[]

Dec 28, 2016
a677712

Merge branch 'master' into map5

Dec 29, 2016
8c5afd7

Merge branch 'master' into map5

Jan 6, 2017
9221336

Fix name: `mapEntries` is more accurate

Jan 6, 2017
c28d98a

Fix test

Jan 9, 2017
a0641b2

Merge branch 'master' into map5

Jan 9, 2017
f0e1fd9

Merge branch 'master' into map5

Jan 11, 2017
37e18d9

Add `createMapFromTemplate` helper

Jan 11, 2017
30462e1

Merge branch 'master' into map5

Jan 11, 2017
b98e82e

Fix one more use of `createMapFromTemplate`

Jan 12, 2017
113338c

Merge branch 'master' into map5

Jan 12, 2017
6b6c34b

Fix typo

Jan 12, 2017
30ccc7a

Merge branch 'master' into map5

Jan 17, 2017

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


1 change: 1 addition & 0 deletions
Gulpfile.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,7 @@ const builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "dia
// processDiagnosticMessages script
gulp.task(processDiagnosticMessagesJs, false, [], () => {
 const settings: tsc.Settings = getCompilerSettings({
 target: "es5",
 declaration: false,
 removeComments: true,
 noResolve: false,
Expand Down

10 changes: 5 additions & 5 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 DownExpand Up@@ -74,7 +74,7 @@ function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

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

 return nameMap;
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[name]);
 var propName = convertPropertyName(nameMap.get(name));

 result +=
 ' ' + propName +
Expand All@@ -114,7 +114,7 @@ function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable,
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap[name]);
 var propName = convertPropertyName(nameMap.get(name));

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

27 changes: 15 additions & 12 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,17 +349,20 @@ 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 = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));
 symbol = symbolTable.get(name);
 if (!symbol) {
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }

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

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -1570,7 +1573,7 @@ namespace ts {
 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 typeLiteralSymbol.members.set(symbol.name, symbol);
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand DownExpand Up@@ -1601,9 +1604,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

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

Expand DownExpand Up@@ -2208,7 +2211,7 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals[constructorFunction.text];
 const funcSymbol = container.locals.get(constructorFunction.text);
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }
Expand DownExpand Up@@ -2239,7 +2242,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames[node.name.text] = node.name.text;
 classifiableNames.set(node.name.text, node.name.text);
 }
 }

Expand All@@ -2255,14 +2258,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");
 if (symbol.exports[prototypeSymbol.name]) {
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0], Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 symbol.exports.set(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
Use native maps when they're available#12715

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


30 commits merged into

from

Jan 17, 2017
 Merged


Use native maps when they're available
#12715
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


30 commits


Select commit
Hold shift + click to select a range
6b1cc89

Use native maps when they're available

Dec 5, 2016
b15ffda

Simplify forEachKeyInMap and someKeyInMap

Dec 8, 2016
863e4d6

Clean up helpers

Dec 8, 2016
8121de7

Fix target error for gulp

Dec 8, 2016
8dbb8e7

Add comment

Dec 8, 2016
55fc62b

Merge branch 'master' into map5

Dec 12, 2016
5c304d0

Remove `createObject`; use `Object.create` directly.

Dec 12, 2016
b53b5cf

Remove the "set" function and use `map.set` with multiple lines of co…

Dec 12, 2016
8386d49

Use sparse arrays for number-keyed maps

Dec 27, 2016
5555258

Add iterators to Map interface, and shim iterators

Dec 27, 2016
3d7b5e6

Make `createMapLike` private and rename to `createDictionaryObject`

Dec 27, 2016
9e33585

Merge branch 'master' into map5

Dec 27, 2016
f510897

Remove "sparseArray" constructor function and just use array literals

Dec 28, 2016
39c19a7

Inline `keysOfMap` and `valuesOfMap`.

Dec 28, 2016
932eaa3

Rename and consolidate map iteration helpers

Dec 28, 2016
145f0b2

Add `createMultiMap` to replace `multiMapAdd` and `multiMapRemove`

Dec 28, 2016
346a865

Merge branch 'master' into map5

Dec 28, 2016
2e6f369

Replace SparseArray<T> with T[]

Dec 28, 2016
a677712

Merge branch 'master' into map5

Dec 29, 2016
8c5afd7

Merge branch 'master' into map5

Jan 6, 2017
9221336

Fix name: `mapEntries` is more accurate

Jan 6, 2017
c28d98a

Fix test

Jan 9, 2017
a0641b2

Merge branch 'master' into map5

Jan 9, 2017
f0e1fd9

Merge branch 'master' into map5

Jan 11, 2017
37e18d9

Add `createMapFromTemplate` helper

Jan 11, 2017
30462e1

Merge branch 'master' into map5

Jan 11, 2017
b98e82e

Fix one more use of `createMapFromTemplate`

Jan 12, 2017
113338c

Merge branch 'master' into map5

Jan 12, 2017
6b6c34b

Fix typo

Jan 12, 2017
30ccc7a

Merge branch 'master' into map5

Jan 17, 2017

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


1 change: 1 addition & 0 deletions
Gulpfile.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -328,6 +328,7 @@ const builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "dia
// processDiagnosticMessages script
gulp.task(processDiagnosticMessagesJs, false, [], () => {
 const settings: tsc.Settings = getCompilerSettings({
 target: "es5",
 declaration: false,
 removeComments: true,
 noResolve: false,
Expand Down

10 changes: 5 additions & 5 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 DownExpand Up@@ -74,7 +74,7 @@ function buildUniqueNameMap(names: string[]): ts.Map<string> {
 var uniqueNames = NameGenerator.ensureUniqueness(names, /* isCaseSensitive */ false, /* isFixed */ undefined);

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

 return nameMap;
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[name]);
 var propName = convertPropertyName(nameMap.get(name));

 result +=
 ' ' + propName +
Expand All@@ -114,7 +114,7 @@ function buildDiagnosticMessageOutput(messageTable: InputDiagnosticMessageTable,
 for (var i = 0; i < names.length; i++) {
 var name = names[i];
 var diagnosticDetails = messageTable[name];
 var propName = convertPropertyName(nameMap[name]);
 var propName = convertPropertyName(nameMap.get(name));

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

27 changes: 15 additions & 12 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -349,17 +349,20 @@ 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 = symbolTable[name] || (symbolTable[name] = createSymbol(SymbolFlags.None, name));
 symbol = symbolTable.get(name);
 if (!symbol) {
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }

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

 if (symbol.flags & excludes) {
 if (symbol.isReplaceableByMethod) {
 // Javascript constructor-declared symbols can be discarded in favor of
 // prototype symbols like methods.
symbol = symbolTable[name] = createSymbol(SymbolFlags.None, name);
 symbolTable.set(name, symbol = createSymbol(SymbolFlags.None, name));
 }
 else {
 if (node.name) {
Expand DownExpand Up@@ -1570,7 +1573,7 @@ namespace ts {
 const typeLiteralSymbol = createSymbol(SymbolFlags.TypeLiteral, "__type");
 addDeclarationToSymbol(typeLiteralSymbol, node, SymbolFlags.TypeLiteral);
 typeLiteralSymbol.members = createMap<Symbol>();
 typeLiteralSymbol.members[symbol.name] = symbol;
 typeLiteralSymbol.members.set(symbol.name, symbol);
 }

 function bindObjectLiteralExpression(node: ObjectLiteralExpression) {
Expand DownExpand Up@@ -1601,9 +1604,9 @@ namespace ts {
 ? ElementKind.Property
 : ElementKind.Accessor;

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

Expand DownExpand Up@@ -2208,7 +2211,7 @@ namespace ts {
 constructorFunction.parent = classPrototype;
 classPrototype.parent = leftSideOfAssignment;

 const funcSymbol = container.locals[constructorFunction.text];
 const funcSymbol = container.locals.get(constructorFunction.text);
 if (!funcSymbol || !(funcSymbol.flags & SymbolFlags.Function || isDeclarationOfFunctionExpression(funcSymbol))) {
 return;
 }
Expand DownExpand Up@@ -2239,7 +2242,7 @@ namespace ts {
 bindAnonymousDeclaration(node, SymbolFlags.Class, bindingName);
 // Add name of class expression into the map for semantic classifier
 if (node.name) {
 classifiableNames[node.name.text] = node.name.text;
 classifiableNames.set(node.name.text, node.name.text);
 }
 }

Expand All@@ -2255,14 +2258,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");
 if (symbol.exports[prototypeSymbol.name]) {
 const symbolExport = symbol.exports.get(prototypeSymbol.name);
 if (symbolExport) {
 if (node.name) {
 node.name.parent = node;
 }
 file.bindDiagnostics.push(createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0],
 Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 file.bindDiagnostics.push(createDiagnosticForNode(symbolExport.declarations[0], Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
 }
 symbol.exports[prototypeSymbol.name] = prototypeSymbol;
 symbol.exports.set(prototypeSymbol.name, prototypeSymbol);
 prototypeSymbol.parent = symbol;
 }

Expand Down
Loading