Reuse subtree transform flags for incrementally parsed nodes#12088

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
Mohamed Hegazy (mhegazy) merged 1 commit into from
Nov 8, 2016
Merged

Reuse subtree transform flags for incrementally parsed nodes #12088

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
66 changes: 64 additions & 2 deletions src/compiler/binder.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -560,6 +560,7 @@ namespace ts {
skipTransformFlagAggregation = true;
bindChildrenWorker(node);
skipTransformFlagAggregation = false;
subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
}
else {
const savedSubtreeTransformFlags = subtreeTransformFlags;
Expand DownExpand Up@@ -895,8 +896,8 @@ namespace ts {
const enclosingLabeledStatement = node.parent.kind === SyntaxKind.LabeledStatement
? lastOrUndefined(activeLabels)
: undefined;
// if do statement is wrapped in labeled statement then target labels for break/continue with or without
// label should be the same
// if do statement is wrapped in labeled statement then target labels for break/continue with or without
// label should be the same
const preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
const postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
addAntecedent(preDoLabel, currentFlow);
Expand DownExpand Up@@ -3206,4 +3207,65 @@ namespace ts {
node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
return transformFlags & ~excludeFlags;
}

/**
* Gets the transform flags to exclude when unioning the transform flags of a subtree.
*
* NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
* For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
* than calling this function.
*/
/* @internal */
export function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
return TransformFlags.TypeExcludes;
}

switch (kind) {
case SyntaxKind.CallExpression:
case SyntaxKind.NewExpression:
case SyntaxKind.ArrayLiteralExpression:
return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
case SyntaxKind.ModuleDeclaration:
return TransformFlags.ModuleExcludes;
case SyntaxKind.Parameter:
return TransformFlags.ParameterExcludes;
case SyntaxKind.ArrowFunction:
return TransformFlags.ArrowFunctionExcludes;
case SyntaxKind.FunctionExpression:
case SyntaxKind.FunctionDeclaration:
return TransformFlags.FunctionExcludes;
case SyntaxKind.VariableDeclarationList:
return TransformFlags.VariableDeclarationListExcludes;
case SyntaxKind.ClassDeclaration:
case SyntaxKind.ClassExpression:
return TransformFlags.ClassExcludes;
case SyntaxKind.Constructor:
return TransformFlags.ConstructorExcludes;
case SyntaxKind.MethodDeclaration:
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
return TransformFlags.MethodOrAccessorExcludes;
case SyntaxKind.AnyKeyword:
case SyntaxKind.NumberKeyword:
case SyntaxKind.NeverKeyword:
case SyntaxKind.StringKeyword:
case SyntaxKind.BooleanKeyword:
case SyntaxKind.SymbolKeyword:
case SyntaxKind.VoidKeyword:
case SyntaxKind.TypeParameter:
case SyntaxKind.PropertySignature:
case SyntaxKind.MethodSignature:
case SyntaxKind.CallSignature:
case SyntaxKind.ConstructSignature:
case SyntaxKind.IndexSignature:
case SyntaxKind.InterfaceDeclaration:
case SyntaxKind.TypeAliasDeclaration:
return TransformFlags.TypeExcludes;
case SyntaxKind.ObjectLiteralExpression:
return TransformFlags.ObjectLiteralExcludes;
default:
return TransformFlags.NodeExcludes;
}
}
}
60 changes: 0 additions & 60 deletions src/compiler/visitor.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1270,66 +1270,6 @@ namespace ts {
return transformFlags | aggregateTransformFlagsForNode(child);
}

/**
* Gets the transform flags to exclude when unioning the transform flags of a subtree.
*
* NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
* For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
* than calling this function.
*/
function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
return TransformFlags.TypeExcludes;
}

switch (kind) {
case SyntaxKind.CallExpression:
case SyntaxKind.NewExpression:
case SyntaxKind.ArrayLiteralExpression:
return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
case SyntaxKind.ModuleDeclaration:
return TransformFlags.ModuleExcludes;
case SyntaxKind.Parameter:
return TransformFlags.ParameterExcludes;
case SyntaxKind.ArrowFunction:
return TransformFlags.ArrowFunctionExcludes;
case SyntaxKind.FunctionExpression:
case SyntaxKind.FunctionDeclaration:
return TransformFlags.FunctionExcludes;
case SyntaxKind.VariableDeclarationList:
return TransformFlags.VariableDeclarationListExcludes;
case SyntaxKind.ClassDeclaration:
case SyntaxKind.ClassExpression:
return TransformFlags.ClassExcludes;
case SyntaxKind.Constructor:
return TransformFlags.ConstructorExcludes;
case SyntaxKind.MethodDeclaration:
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
return TransformFlags.MethodOrAccessorExcludes;
case SyntaxKind.AnyKeyword:
case SyntaxKind.NumberKeyword:
case SyntaxKind.NeverKeyword:
case SyntaxKind.StringKeyword:
case SyntaxKind.BooleanKeyword:
case SyntaxKind.SymbolKeyword:
case SyntaxKind.VoidKeyword:
case SyntaxKind.TypeParameter:
case SyntaxKind.PropertySignature:
case SyntaxKind.MethodSignature:
case SyntaxKind.CallSignature:
case SyntaxKind.ConstructSignature:
case SyntaxKind.IndexSignature:
case SyntaxKind.InterfaceDeclaration:
case SyntaxKind.TypeAliasDeclaration:
return TransformFlags.TypeExcludes;
case SyntaxKind.ObjectLiteralExpression:
return TransformFlags.ObjectLiteralExcludes;
default:
return TransformFlags.NodeExcludes;
}
}

export namespace Debug {
export const failNotOptional = shouldAssert(AssertionLevel.Normal)
? (message?: string) => assert(false, message || "Node not optional.")
Expand Down
24 changes: 17 additions & 7 deletions src/harness/unittests/incrementalParser.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@ namespace ts {

// NOTE: 'reusedElements' is the expected count of elements reused from the old tree to the new
// tree. It may change as we tweak the parser. If the count increases then that should always
// be a good thing. If it decreases, that's not great (less reusability), but that may be
// unavoidable. If it does decrease an investigation should be done to make sure that things
// be a good thing. If it decreases, that's not great (less reusability), but that may be
// unavoidable. If it does decrease an investigation should be done to make sure that things
// are still ok and we're still appropriately reusing most of the tree.
function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile): SourceFile {
function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile) {
oldTree = oldTree || createTree(oldText, /*version:*/ ".");
Utils.assertInvariants(oldTree, /*parent:*/ undefined);

Expand DownExpand Up@@ -76,7 +76,7 @@ namespace ts {
assert.equal(actualReusedCount, expectedReusedElements, actualReusedCount + " !== " + expectedReusedElements);
}

return incrementalNewTree;
return { oldTree, newTree, incrementalNewTree };
}

function reusedElements(oldNode: SourceFile, newNode: SourceFile): number {
Expand All@@ -103,7 +103,7 @@ namespace ts {
for (let i = 0; i < repeat; i++) {
const oldText = ScriptSnapshot.fromString(source);
const newTextAndChange = withDelete(oldText, index, 1);
const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
oldTree = newTree;
Expand All@@ -116,7 +116,7 @@ namespace ts {
for (let i = 0; i < repeat; i++) {
const oldText = ScriptSnapshot.fromString(source);
const newTextAndChange = withInsert(oldText, index + i, toInsert.charAt(i));
const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
oldTree = newTree;
Expand DownExpand Up@@ -639,7 +639,7 @@ module m3 { }\
});

it("Unterminated comment after keyword converted to identifier", () => {
// 'public' as a keyword should be incrementally unusable (because it has an
// 'public' as a keyword should be incrementally unusable (because it has an
// unterminated comment). When we convert it to an identifier, that shouldn't
// change anything, and we should still get the same errors.
const source = "return; a.public /*";
Expand DownExpand Up@@ -796,6 +796,16 @@ module m3 { }\
compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, 4);
});

it("Reuse transformFlags of subtree during bind", () => {
const source = `class Greeter { constructor(element: HTMLElement) { } }`;
const oldText = ScriptSnapshot.fromString(source);
const newTextAndChange = withChange(oldText, 15, 0, "\n");
const { oldTree, incrementalNewTree } = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1);
bindSourceFile(oldTree, {});
bindSourceFile(incrementalNewTree, {});
assert.equal(oldTree.transformFlags, incrementalNewTree.transformFlags);
});

// Simulated typing tests.

it("Type extends clause 1", () => {
Expand Down
2 changes: 0 additions & 2 deletions src/services/services.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,15 +48,13 @@ namespace ts {
public jsDocComments: JSDoc[];
public original: Node;
public transformFlags: TransformFlags;
public excludeTransformFlags: TransformFlags;
private _children: Node[];

constructor(kind: SyntaxKind, pos: number, end: number) {
this.pos = pos;
this.end = end;
this.flags = NodeFlags.None;
this.transformFlags = undefined;
this.excludeTransformFlags = undefined;
this.parent = undefined;
this.kind = kind;
}
Expand Down
, '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
Reuse subtree transform flags for incrementally parsed nodes#12088

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

Mohamed Hegazy (mhegazy)
merged 1 commit into

from

Nov 8, 2016
 Merged


Reuse subtree transform flags for incrementally parsed nodes
#12088
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


66 changes: 64 additions & 2 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -560,6 +560,7 @@ namespace ts {
 skipTransformFlagAggregation = true;
 bindChildrenWorker(node);
 skipTransformFlagAggregation = false;
 subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
 }
 else {
 const savedSubtreeTransformFlags = subtreeTransformFlags;
Expand DownExpand Up@@ -895,8 +896,8 @@ namespace ts {
 const enclosingLabeledStatement = node.parent.kind === SyntaxKind.LabeledStatement
 ? lastOrUndefined(activeLabels)
 : undefined;
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 const preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
 const postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
 addAntecedent(preDoLabel, currentFlow);
Expand DownExpand Up@@ -3206,4 +3207,65 @@ namespace ts {
 node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
 return transformFlags & ~excludeFlags;
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 /* @internal */
 export function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }
}

60 changes: 0 additions & 60 deletions
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1270,66 +1270,6 @@ namespace ts {
 return transformFlags | aggregateTransformFlagsForNode(child);
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }

 export namespace Debug {
 export const failNotOptional = shouldAssert(AssertionLevel.Normal)
 ? (message?: string) => assert(false, message || "Node not optional.")
Expand Down

24 changes: 17 additions & 7 deletions
src/harness/unittests/incrementalParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@ namespace ts {

 // NOTE: 'reusedElements' is the expected count of elements reused from the old tree to the new
 // tree. It may change as we tweak the parser. If the count increases then that should always
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // are still ok and we're still appropriately reusing most of the tree.
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile): SourceFile {
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile) {
 oldTree = oldTree || createTree(oldText, /*version:*/ ".");
 Utils.assertInvariants(oldTree, /*parent:*/ undefined);

Expand DownExpand Up@@ -76,7 +76,7 @@ namespace ts {
 assert.equal(actualReusedCount, expectedReusedElements, actualReusedCount + " !== " + expectedReusedElements);
 }

 return incrementalNewTree;
 return { oldTree, newTree, incrementalNewTree };
 }

 function reusedElements(oldNode: SourceFile, newNode: SourceFile): number {
Expand All@@ -103,7 +103,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withDelete(oldText, index, 1);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand All@@ -116,7 +116,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withInsert(oldText, index + i, toInsert.charAt(i));
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand DownExpand Up@@ -639,7 +639,7 @@ module m3 { }\
 });

 it("Unterminated comment after keyword converted to identifier", () => {
 // 'public' as a keyword should be incrementally unusable (because it has an
 // 'public' as a keyword should be incrementally unusable (because it has an
 // unterminated comment). When we convert it to an identifier, that shouldn't
 // change anything, and we should still get the same errors.
 const source = "return; a.public /*";
Expand DownExpand Up@@ -796,6 +796,16 @@ module m3 { }\
 compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, 4);
 });

 it("Reuse transformFlags of subtree during bind", () => {
 const source = `class Greeter { constructor(element: HTMLElement) { } }`;
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withChange(oldText, 15, 0, "\n");
 const { oldTree, incrementalNewTree } = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1);
 bindSourceFile(oldTree, {});
 bindSourceFile(incrementalNewTree, {});
 assert.equal(oldTree.transformFlags, incrementalNewTree.transformFlags);
 });

 // Simulated typing tests.

 it("Type extends clause 1", () => {
Expand Down

2 changes: 0 additions & 2 deletions
src/services/services.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,15 +48,13 @@ namespace ts {
 public jsDocComments: JSDoc[];
 public original: Node;
 public transformFlags: TransformFlags;
 public excludeTransformFlags: TransformFlags;
 private _children: Node[];

 constructor(kind: SyntaxKind, pos: number, end: number) {
 this.pos = pos;
 this.end = end;
 this.flags = NodeFlags.None;
 this.transformFlags = undefined;
 this.excludeTransformFlags = undefined;
 this.parent = undefined;
 this.kind = kind;
 }
Expand Down

, '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
Reuse subtree transform flags for incrementally parsed nodes#12088

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

Mohamed Hegazy (mhegazy)
merged 1 commit into

from

Nov 8, 2016
 Merged


Reuse subtree transform flags for incrementally parsed nodes
#12088
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


66 changes: 64 additions & 2 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -560,6 +560,7 @@ namespace ts {
 skipTransformFlagAggregation = true;
 bindChildrenWorker(node);
 skipTransformFlagAggregation = false;
 subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
 }
 else {
 const savedSubtreeTransformFlags = subtreeTransformFlags;
Expand DownExpand Up@@ -895,8 +896,8 @@ namespace ts {
 const enclosingLabeledStatement = node.parent.kind === SyntaxKind.LabeledStatement
 ? lastOrUndefined(activeLabels)
 : undefined;
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 const preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
 const postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
 addAntecedent(preDoLabel, currentFlow);
Expand DownExpand Up@@ -3206,4 +3207,65 @@ namespace ts {
 node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
 return transformFlags & ~excludeFlags;
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 /* @internal */
 export function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }
}

60 changes: 0 additions & 60 deletions
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1270,66 +1270,6 @@ namespace ts {
 return transformFlags | aggregateTransformFlagsForNode(child);
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }

 export namespace Debug {
 export const failNotOptional = shouldAssert(AssertionLevel.Normal)
 ? (message?: string) => assert(false, message || "Node not optional.")
Expand Down

24 changes: 17 additions & 7 deletions
src/harness/unittests/incrementalParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@ namespace ts {

 // NOTE: 'reusedElements' is the expected count of elements reused from the old tree to the new
 // tree. It may change as we tweak the parser. If the count increases then that should always
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // are still ok and we're still appropriately reusing most of the tree.
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile): SourceFile {
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile) {
 oldTree = oldTree || createTree(oldText, /*version:*/ ".");
 Utils.assertInvariants(oldTree, /*parent:*/ undefined);

Expand DownExpand Up@@ -76,7 +76,7 @@ namespace ts {
 assert.equal(actualReusedCount, expectedReusedElements, actualReusedCount + " !== " + expectedReusedElements);
 }

 return incrementalNewTree;
 return { oldTree, newTree, incrementalNewTree };
 }

 function reusedElements(oldNode: SourceFile, newNode: SourceFile): number {
Expand All@@ -103,7 +103,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withDelete(oldText, index, 1);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand All@@ -116,7 +116,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withInsert(oldText, index + i, toInsert.charAt(i));
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand DownExpand Up@@ -639,7 +639,7 @@ module m3 { }\
 });

 it("Unterminated comment after keyword converted to identifier", () => {
 // 'public' as a keyword should be incrementally unusable (because it has an
 // 'public' as a keyword should be incrementally unusable (because it has an
 // unterminated comment). When we convert it to an identifier, that shouldn't
 // change anything, and we should still get the same errors.
 const source = "return; a.public /*";
Expand DownExpand Up@@ -796,6 +796,16 @@ module m3 { }\
 compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, 4);
 });

 it("Reuse transformFlags of subtree during bind", () => {
 const source = `class Greeter { constructor(element: HTMLElement) { } }`;
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withChange(oldText, 15, 0, "\n");
 const { oldTree, incrementalNewTree } = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1);
 bindSourceFile(oldTree, {});
 bindSourceFile(incrementalNewTree, {});
 assert.equal(oldTree.transformFlags, incrementalNewTree.transformFlags);
 });

 // Simulated typing tests.

 it("Type extends clause 1", () => {
Expand Down

2 changes: 0 additions & 2 deletions
src/services/services.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,15 +48,13 @@ namespace ts {
 public jsDocComments: JSDoc[];
 public original: Node;
 public transformFlags: TransformFlags;
 public excludeTransformFlags: TransformFlags;
 private _children: Node[];

 constructor(kind: SyntaxKind, pos: number, end: number) {
 this.pos = pos;
 this.end = end;
 this.flags = NodeFlags.None;
 this.transformFlags = undefined;
 this.excludeTransformFlags = undefined;
 this.parent = undefined;
 this.kind = kind;
 }
Expand Down

, '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
Reuse subtree transform flags for incrementally parsed nodes#12088

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

Mohamed Hegazy (mhegazy)
merged 1 commit into

from

Nov 8, 2016
 Merged


Reuse subtree transform flags for incrementally parsed nodes
#12088
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


66 changes: 64 additions & 2 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -560,6 +560,7 @@ namespace ts {
 skipTransformFlagAggregation = true;
 bindChildrenWorker(node);
 skipTransformFlagAggregation = false;
 subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
 }
 else {
 const savedSubtreeTransformFlags = subtreeTransformFlags;
Expand DownExpand Up@@ -895,8 +896,8 @@ namespace ts {
 const enclosingLabeledStatement = node.parent.kind === SyntaxKind.LabeledStatement
 ? lastOrUndefined(activeLabels)
 : undefined;
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 const preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
 const postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
 addAntecedent(preDoLabel, currentFlow);
Expand DownExpand Up@@ -3206,4 +3207,65 @@ namespace ts {
 node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
 return transformFlags & ~excludeFlags;
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 /* @internal */
 export function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }
}

60 changes: 0 additions & 60 deletions
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1270,66 +1270,6 @@ namespace ts {
 return transformFlags | aggregateTransformFlagsForNode(child);
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }

 export namespace Debug {
 export const failNotOptional = shouldAssert(AssertionLevel.Normal)
 ? (message?: string) => assert(false, message || "Node not optional.")
Expand Down

24 changes: 17 additions & 7 deletions
src/harness/unittests/incrementalParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@ namespace ts {

 // NOTE: 'reusedElements' is the expected count of elements reused from the old tree to the new
 // tree. It may change as we tweak the parser. If the count increases then that should always
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // are still ok and we're still appropriately reusing most of the tree.
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile): SourceFile {
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile) {
 oldTree = oldTree || createTree(oldText, /*version:*/ ".");
 Utils.assertInvariants(oldTree, /*parent:*/ undefined);

Expand DownExpand Up@@ -76,7 +76,7 @@ namespace ts {
 assert.equal(actualReusedCount, expectedReusedElements, actualReusedCount + " !== " + expectedReusedElements);
 }

 return incrementalNewTree;
 return { oldTree, newTree, incrementalNewTree };
 }

 function reusedElements(oldNode: SourceFile, newNode: SourceFile): number {
Expand All@@ -103,7 +103,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withDelete(oldText, index, 1);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand All@@ -116,7 +116,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withInsert(oldText, index + i, toInsert.charAt(i));
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand DownExpand Up@@ -639,7 +639,7 @@ module m3 { }\
 });

 it("Unterminated comment after keyword converted to identifier", () => {
 // 'public' as a keyword should be incrementally unusable (because it has an
 // 'public' as a keyword should be incrementally unusable (because it has an
 // unterminated comment). When we convert it to an identifier, that shouldn't
 // change anything, and we should still get the same errors.
 const source = "return; a.public /*";
Expand DownExpand Up@@ -796,6 +796,16 @@ module m3 { }\
 compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, 4);
 });

 it("Reuse transformFlags of subtree during bind", () => {
 const source = `class Greeter { constructor(element: HTMLElement) { } }`;
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withChange(oldText, 15, 0, "\n");
 const { oldTree, incrementalNewTree } = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1);
 bindSourceFile(oldTree, {});
 bindSourceFile(incrementalNewTree, {});
 assert.equal(oldTree.transformFlags, incrementalNewTree.transformFlags);
 });

 // Simulated typing tests.

 it("Type extends clause 1", () => {
Expand Down

2 changes: 0 additions & 2 deletions
src/services/services.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,15 +48,13 @@ namespace ts {
 public jsDocComments: JSDoc[];
 public original: Node;
 public transformFlags: TransformFlags;
 public excludeTransformFlags: TransformFlags;
 private _children: Node[];

 constructor(kind: SyntaxKind, pos: number, end: number) {
 this.pos = pos;
 this.end = end;
 this.flags = NodeFlags.None;
 this.transformFlags = undefined;
 this.excludeTransformFlags = undefined;
 this.parent = undefined;
 this.kind = kind;
 }
Expand Down

, '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
Reuse subtree transform flags for incrementally parsed nodes#12088

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

Mohamed Hegazy (mhegazy)
merged 1 commit into

from

Nov 8, 2016
 Merged


Reuse subtree transform flags for incrementally parsed nodes
#12088
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


66 changes: 64 additions & 2 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -560,6 +560,7 @@ namespace ts {
 skipTransformFlagAggregation = true;
 bindChildrenWorker(node);
 skipTransformFlagAggregation = false;
 subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
 }
 else {
 const savedSubtreeTransformFlags = subtreeTransformFlags;
Expand DownExpand Up@@ -895,8 +896,8 @@ namespace ts {
 const enclosingLabeledStatement = node.parent.kind === SyntaxKind.LabeledStatement
 ? lastOrUndefined(activeLabels)
 : undefined;
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 const preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
 const postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
 addAntecedent(preDoLabel, currentFlow);
Expand DownExpand Up@@ -3206,4 +3207,65 @@ namespace ts {
 node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
 return transformFlags & ~excludeFlags;
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 /* @internal */
 export function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }
}

60 changes: 0 additions & 60 deletions
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1270,66 +1270,6 @@ namespace ts {
 return transformFlags | aggregateTransformFlagsForNode(child);
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }

 export namespace Debug {
 export const failNotOptional = shouldAssert(AssertionLevel.Normal)
 ? (message?: string) => assert(false, message || "Node not optional.")
Expand Down

24 changes: 17 additions & 7 deletions
src/harness/unittests/incrementalParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@ namespace ts {

 // NOTE: 'reusedElements' is the expected count of elements reused from the old tree to the new
 // tree. It may change as we tweak the parser. If the count increases then that should always
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // are still ok and we're still appropriately reusing most of the tree.
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile): SourceFile {
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile) {
 oldTree = oldTree || createTree(oldText, /*version:*/ ".");
 Utils.assertInvariants(oldTree, /*parent:*/ undefined);

Expand DownExpand Up@@ -76,7 +76,7 @@ namespace ts {
 assert.equal(actualReusedCount, expectedReusedElements, actualReusedCount + " !== " + expectedReusedElements);
 }

 return incrementalNewTree;
 return { oldTree, newTree, incrementalNewTree };
 }

 function reusedElements(oldNode: SourceFile, newNode: SourceFile): number {
Expand All@@ -103,7 +103,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withDelete(oldText, index, 1);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand All@@ -116,7 +116,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withInsert(oldText, index + i, toInsert.charAt(i));
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand DownExpand Up@@ -639,7 +639,7 @@ module m3 { }\
 });

 it("Unterminated comment after keyword converted to identifier", () => {
 // 'public' as a keyword should be incrementally unusable (because it has an
 // 'public' as a keyword should be incrementally unusable (because it has an
 // unterminated comment). When we convert it to an identifier, that shouldn't
 // change anything, and we should still get the same errors.
 const source = "return; a.public /*";
Expand DownExpand Up@@ -796,6 +796,16 @@ module m3 { }\
 compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, 4);
 });

 it("Reuse transformFlags of subtree during bind", () => {
 const source = `class Greeter { constructor(element: HTMLElement) { } }`;
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withChange(oldText, 15, 0, "\n");
 const { oldTree, incrementalNewTree } = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1);
 bindSourceFile(oldTree, {});
 bindSourceFile(incrementalNewTree, {});
 assert.equal(oldTree.transformFlags, incrementalNewTree.transformFlags);
 });

 // Simulated typing tests.

 it("Type extends clause 1", () => {
Expand Down

2 changes: 0 additions & 2 deletions
src/services/services.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,15 +48,13 @@ namespace ts {
 public jsDocComments: JSDoc[];
 public original: Node;
 public transformFlags: TransformFlags;
 public excludeTransformFlags: TransformFlags;
 private _children: Node[];

 constructor(kind: SyntaxKind, pos: number, end: number) {
 this.pos = pos;
 this.end = end;
 this.flags = NodeFlags.None;
 this.transformFlags = undefined;
 this.excludeTransformFlags = undefined;
 this.parent = undefined;
 this.kind = kind;
 }
Expand Down

, '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
Reuse subtree transform flags for incrementally parsed nodes#12088

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

Mohamed Hegazy (mhegazy)
merged 1 commit into

from

Nov 8, 2016
 Merged


Reuse subtree transform flags for incrementally parsed nodes
#12088
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


66 changes: 64 additions & 2 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -560,6 +560,7 @@ namespace ts {
 skipTransformFlagAggregation = true;
 bindChildrenWorker(node);
 skipTransformFlagAggregation = false;
 subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
 }
 else {
 const savedSubtreeTransformFlags = subtreeTransformFlags;
Expand DownExpand Up@@ -895,8 +896,8 @@ namespace ts {
 const enclosingLabeledStatement = node.parent.kind === SyntaxKind.LabeledStatement
 ? lastOrUndefined(activeLabels)
 : undefined;
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 const preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
 const postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
 addAntecedent(preDoLabel, currentFlow);
Expand DownExpand Up@@ -3206,4 +3207,65 @@ namespace ts {
 node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
 return transformFlags & ~excludeFlags;
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 /* @internal */
 export function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }
}

60 changes: 0 additions & 60 deletions
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1270,66 +1270,6 @@ namespace ts {
 return transformFlags | aggregateTransformFlagsForNode(child);
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }

 export namespace Debug {
 export const failNotOptional = shouldAssert(AssertionLevel.Normal)
 ? (message?: string) => assert(false, message || "Node not optional.")
Expand Down

24 changes: 17 additions & 7 deletions
src/harness/unittests/incrementalParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@ namespace ts {

 // NOTE: 'reusedElements' is the expected count of elements reused from the old tree to the new
 // tree. It may change as we tweak the parser. If the count increases then that should always
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // are still ok and we're still appropriately reusing most of the tree.
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile): SourceFile {
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile) {
 oldTree = oldTree || createTree(oldText, /*version:*/ ".");
 Utils.assertInvariants(oldTree, /*parent:*/ undefined);

Expand DownExpand Up@@ -76,7 +76,7 @@ namespace ts {
 assert.equal(actualReusedCount, expectedReusedElements, actualReusedCount + " !== " + expectedReusedElements);
 }

 return incrementalNewTree;
 return { oldTree, newTree, incrementalNewTree };
 }

 function reusedElements(oldNode: SourceFile, newNode: SourceFile): number {
Expand All@@ -103,7 +103,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withDelete(oldText, index, 1);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand All@@ -116,7 +116,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withInsert(oldText, index + i, toInsert.charAt(i));
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand DownExpand Up@@ -639,7 +639,7 @@ module m3 { }\
 });

 it("Unterminated comment after keyword converted to identifier", () => {
 // 'public' as a keyword should be incrementally unusable (because it has an
 // 'public' as a keyword should be incrementally unusable (because it has an
 // unterminated comment). When we convert it to an identifier, that shouldn't
 // change anything, and we should still get the same errors.
 const source = "return; a.public /*";
Expand DownExpand Up@@ -796,6 +796,16 @@ module m3 { }\
 compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, 4);
 });

 it("Reuse transformFlags of subtree during bind", () => {
 const source = `class Greeter { constructor(element: HTMLElement) { } }`;
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withChange(oldText, 15, 0, "\n");
 const { oldTree, incrementalNewTree } = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1);
 bindSourceFile(oldTree, {});
 bindSourceFile(incrementalNewTree, {});
 assert.equal(oldTree.transformFlags, incrementalNewTree.transformFlags);
 });

 // Simulated typing tests.

 it("Type extends clause 1", () => {
Expand Down

2 changes: 0 additions & 2 deletions
src/services/services.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,15 +48,13 @@ namespace ts {
 public jsDocComments: JSDoc[];
 public original: Node;
 public transformFlags: TransformFlags;
 public excludeTransformFlags: TransformFlags;
 private _children: Node[];

 constructor(kind: SyntaxKind, pos: number, end: number) {
 this.pos = pos;
 this.end = end;
 this.flags = NodeFlags.None;
 this.transformFlags = undefined;
 this.excludeTransformFlags = undefined;
 this.parent = undefined;
 this.kind = kind;
 }
Expand Down

, '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
Reuse subtree transform flags for incrementally parsed nodes#12088

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

Mohamed Hegazy (mhegazy)
merged 1 commit into

from

Nov 8, 2016
 Merged


Reuse subtree transform flags for incrementally parsed nodes
#12088
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


66 changes: 64 additions & 2 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -560,6 +560,7 @@ namespace ts {
 skipTransformFlagAggregation = true;
 bindChildrenWorker(node);
 skipTransformFlagAggregation = false;
 subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
 }
 else {
 const savedSubtreeTransformFlags = subtreeTransformFlags;
Expand DownExpand Up@@ -895,8 +896,8 @@ namespace ts {
 const enclosingLabeledStatement = node.parent.kind === SyntaxKind.LabeledStatement
 ? lastOrUndefined(activeLabels)
 : undefined;
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 const preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
 const postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
 addAntecedent(preDoLabel, currentFlow);
Expand DownExpand Up@@ -3206,4 +3207,65 @@ namespace ts {
 node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
 return transformFlags & ~excludeFlags;
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 /* @internal */
 export function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }
}

60 changes: 0 additions & 60 deletions
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1270,66 +1270,6 @@ namespace ts {
 return transformFlags | aggregateTransformFlagsForNode(child);
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }

 export namespace Debug {
 export const failNotOptional = shouldAssert(AssertionLevel.Normal)
 ? (message?: string) => assert(false, message || "Node not optional.")
Expand Down

24 changes: 17 additions & 7 deletions
src/harness/unittests/incrementalParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@ namespace ts {

 // NOTE: 'reusedElements' is the expected count of elements reused from the old tree to the new
 // tree. It may change as we tweak the parser. If the count increases then that should always
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // are still ok and we're still appropriately reusing most of the tree.
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile): SourceFile {
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile) {
 oldTree = oldTree || createTree(oldText, /*version:*/ ".");
 Utils.assertInvariants(oldTree, /*parent:*/ undefined);

Expand DownExpand Up@@ -76,7 +76,7 @@ namespace ts {
 assert.equal(actualReusedCount, expectedReusedElements, actualReusedCount + " !== " + expectedReusedElements);
 }

 return incrementalNewTree;
 return { oldTree, newTree, incrementalNewTree };
 }

 function reusedElements(oldNode: SourceFile, newNode: SourceFile): number {
Expand All@@ -103,7 +103,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withDelete(oldText, index, 1);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand All@@ -116,7 +116,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withInsert(oldText, index + i, toInsert.charAt(i));
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand DownExpand Up@@ -639,7 +639,7 @@ module m3 { }\
 });

 it("Unterminated comment after keyword converted to identifier", () => {
 // 'public' as a keyword should be incrementally unusable (because it has an
 // 'public' as a keyword should be incrementally unusable (because it has an
 // unterminated comment). When we convert it to an identifier, that shouldn't
 // change anything, and we should still get the same errors.
 const source = "return; a.public /*";
Expand DownExpand Up@@ -796,6 +796,16 @@ module m3 { }\
 compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, 4);
 });

 it("Reuse transformFlags of subtree during bind", () => {
 const source = `class Greeter { constructor(element: HTMLElement) { } }`;
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withChange(oldText, 15, 0, "\n");
 const { oldTree, incrementalNewTree } = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1);
 bindSourceFile(oldTree, {});
 bindSourceFile(incrementalNewTree, {});
 assert.equal(oldTree.transformFlags, incrementalNewTree.transformFlags);
 });

 // Simulated typing tests.

 it("Type extends clause 1", () => {
Expand Down

2 changes: 0 additions & 2 deletions
src/services/services.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,15 +48,13 @@ namespace ts {
 public jsDocComments: JSDoc[];
 public original: Node;
 public transformFlags: TransformFlags;
 public excludeTransformFlags: TransformFlags;
 private _children: Node[];

 constructor(kind: SyntaxKind, pos: number, end: number) {
 this.pos = pos;
 this.end = end;
 this.flags = NodeFlags.None;
 this.transformFlags = undefined;
 this.excludeTransformFlags = undefined;
 this.parent = undefined;
 this.kind = kind;
 }
Expand Down

, '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
Reuse subtree transform flags for incrementally parsed nodes#12088

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

Mohamed Hegazy (mhegazy)
merged 1 commit into

from

Nov 8, 2016
 Merged


Reuse subtree transform flags for incrementally parsed nodes
#12088
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


66 changes: 64 additions & 2 deletions
src/compiler/binder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -560,6 +560,7 @@ namespace ts {
 skipTransformFlagAggregation = true;
 bindChildrenWorker(node);
 skipTransformFlagAggregation = false;
 subtreeTransformFlags |= node.transformFlags & ~getTransformFlagsSubtreeExclusions(node.kind);
 }
 else {
 const savedSubtreeTransformFlags = subtreeTransformFlags;
Expand DownExpand Up@@ -895,8 +896,8 @@ namespace ts {
 const enclosingLabeledStatement = node.parent.kind === SyntaxKind.LabeledStatement
 ? lastOrUndefined(activeLabels)
 : undefined;
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 // if do statement is wrapped in labeled statement then target labels for break/continue with or without
 // label should be the same
 const preConditionLabel = enclosingLabeledStatement ? enclosingLabeledStatement.continueTarget : createBranchLabel();
 const postDoLabel = enclosingLabeledStatement ? enclosingLabeledStatement.breakTarget : createBranchLabel();
 addAntecedent(preDoLabel, currentFlow);
Expand DownExpand Up@@ -3206,4 +3207,65 @@ namespace ts {
 node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
 return transformFlags & ~excludeFlags;
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 /* @internal */
 export function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }
}

60 changes: 0 additions & 60 deletions
src/compiler/visitor.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1270,66 +1270,6 @@ namespace ts {
 return transformFlags | aggregateTransformFlagsForNode(child);
 }

 /**
 * Gets the transform flags to exclude when unioning the transform flags of a subtree.
 *
 * NOTE: This needs to be kept up-to-date with the exclusions used in `computeTransformFlagsForNode`.
 * For performance reasons, `computeTransformFlagsForNode` uses local constant values rather
 * than calling this function.
 */
 function getTransformFlagsSubtreeExclusions(kind: SyntaxKind) {
 if (kind >= SyntaxKind.FirstTypeNode && kind <= SyntaxKind.LastTypeNode) {
 return TransformFlags.TypeExcludes;
 }

 switch (kind) {
 case SyntaxKind.CallExpression:
 case SyntaxKind.NewExpression:
 case SyntaxKind.ArrayLiteralExpression:
 return TransformFlags.ArrayLiteralOrCallOrNewExcludes;
 case SyntaxKind.ModuleDeclaration:
 return TransformFlags.ModuleExcludes;
 case SyntaxKind.Parameter:
 return TransformFlags.ParameterExcludes;
 case SyntaxKind.ArrowFunction:
 return TransformFlags.ArrowFunctionExcludes;
 case SyntaxKind.FunctionExpression:
 case SyntaxKind.FunctionDeclaration:
 return TransformFlags.FunctionExcludes;
 case SyntaxKind.VariableDeclarationList:
 return TransformFlags.VariableDeclarationListExcludes;
 case SyntaxKind.ClassDeclaration:
 case SyntaxKind.ClassExpression:
 return TransformFlags.ClassExcludes;
 case SyntaxKind.Constructor:
 return TransformFlags.ConstructorExcludes;
 case SyntaxKind.MethodDeclaration:
 case SyntaxKind.GetAccessor:
 case SyntaxKind.SetAccessor:
 return TransformFlags.MethodOrAccessorExcludes;
 case SyntaxKind.AnyKeyword:
 case SyntaxKind.NumberKeyword:
 case SyntaxKind.NeverKeyword:
 case SyntaxKind.StringKeyword:
 case SyntaxKind.BooleanKeyword:
 case SyntaxKind.SymbolKeyword:
 case SyntaxKind.VoidKeyword:
 case SyntaxKind.TypeParameter:
 case SyntaxKind.PropertySignature:
 case SyntaxKind.MethodSignature:
 case SyntaxKind.CallSignature:
 case SyntaxKind.ConstructSignature:
 case SyntaxKind.IndexSignature:
 case SyntaxKind.InterfaceDeclaration:
 case SyntaxKind.TypeAliasDeclaration:
 return TransformFlags.TypeExcludes;
 case SyntaxKind.ObjectLiteralExpression:
 return TransformFlags.ObjectLiteralExcludes;
 default:
 return TransformFlags.NodeExcludes;
 }
 }

 export namespace Debug {
 export const failNotOptional = shouldAssert(AssertionLevel.Normal)
 ? (message?: string) => assert(false, message || "Node not optional.")
Expand Down

24 changes: 17 additions & 7 deletions
src/harness/unittests/incrementalParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,10 +44,10 @@ namespace ts {

 // NOTE: 'reusedElements' is the expected count of elements reused from the old tree to the new
 // tree. It may change as we tweak the parser. If the count increases then that should always
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // be a good thing. If it decreases, that's not great (less reusability), but that may be
 // unavoidable. If it does decrease an investigation should be done to make sure that things
 // are still ok and we're still appropriately reusing most of the tree.
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile): SourceFile {
 function compareTrees(oldText: IScriptSnapshot, newText: IScriptSnapshot, textChangeRange: TextChangeRange, expectedReusedElements: number, oldTree?: SourceFile) {
 oldTree = oldTree || createTree(oldText, /*version:*/ ".");
 Utils.assertInvariants(oldTree, /*parent:*/ undefined);

Expand DownExpand Up@@ -76,7 +76,7 @@ namespace ts {
 assert.equal(actualReusedCount, expectedReusedElements, actualReusedCount + " !== " + expectedReusedElements);
 }

 return incrementalNewTree;
 return { oldTree, newTree, incrementalNewTree };
 }

 function reusedElements(oldNode: SourceFile, newNode: SourceFile): number {
Expand All@@ -103,7 +103,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withDelete(oldText, index, 1);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand All@@ -116,7 +116,7 @@ namespace ts {
 for (let i = 0; i < repeat; i++) {
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withInsert(oldText, index + i, toInsert.charAt(i));
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree);
 const newTree = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1, oldTree).incrementalNewTree;

 source = newTextAndChange.text.getText(0, newTextAndChange.text.getLength());
 oldTree = newTree;
Expand DownExpand Up@@ -639,7 +639,7 @@ module m3 { }\
 });

 it("Unterminated comment after keyword converted to identifier", () => {
 // 'public' as a keyword should be incrementally unusable (because it has an
 // 'public' as a keyword should be incrementally unusable (because it has an
 // unterminated comment). When we convert it to an identifier, that shouldn't
 // change anything, and we should still get the same errors.
 const source = "return; a.public /*";
Expand DownExpand Up@@ -796,6 +796,16 @@ module m3 { }\
 compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, 4);
 });

 it("Reuse transformFlags of subtree during bind", () => {
 const source = `class Greeter { constructor(element: HTMLElement) { } }`;
 const oldText = ScriptSnapshot.fromString(source);
 const newTextAndChange = withChange(oldText, 15, 0, "\n");
 const { oldTree, incrementalNewTree } = compareTrees(oldText, newTextAndChange.text, newTextAndChange.textChangeRange, -1);
 bindSourceFile(oldTree, {});
 bindSourceFile(incrementalNewTree, {});
 assert.equal(oldTree.transformFlags, incrementalNewTree.transformFlags);
 });

 // Simulated typing tests.

 it("Type extends clause 1", () => {
Expand Down

2 changes: 0 additions & 2 deletions
src/services/services.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,15 +48,13 @@ namespace ts {
 public jsDocComments: JSDoc[];
 public original: Node;
 public transformFlags: TransformFlags;
 public excludeTransformFlags: TransformFlags;
 private _children: Node[];

 constructor(kind: SyntaxKind, pos: number, end: number) {
 this.pos = pos;
 this.end = end;
 this.flags = NodeFlags.None;
 this.transformFlags = undefined;
 this.excludeTransformFlags = undefined;
 this.parent = undefined;
 this.kind = kind;
 }
Expand Down