Skip to content

Commit 4d64583

Browse files
rbucktonrbuckton
committed
Monomorphic Symbol access
1 parent 6d41964 commit 4d64583

File tree

11 files changed

+166
-137
lines changed

11 files changed

+166
-137
lines changed

‎src/compiler/checker.ts‎

Lines changed: 110 additions & 106 deletions
Large diffs are not rendered by default.

‎src/compiler/types.ts‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5735,14 +5735,14 @@ export interface Symbol {
57355735
members?: SymbolTable; // Class, interface or object literal instance members
57365736
exports?: SymbolTable; // Module exports
57375737
globalExports?: SymbolTable; // Conditional global UMD exports
5738-
/** @internal */ id?: SymbolId; // Unique id (used to look up SymbolLinks)
5739-
/** @internal */ mergeId?: number; // Merge id (used to look up merged symbol)
5740-
/** @internal */ parent?: Symbol; // Parent symbol
5741-
/** @internal */ exportSymbol?: Symbol; // Exported symbol associated with this symbol
5742-
/** @internal */ constEnumOnlyModule?: boolean; // True if module contains only const enums or other modules with only const enums
5738+
/** @internal */ id: SymbolId; // Unique id (used to look up SymbolLinks)
5739+
/** @internal */ mergeId: number; // Merge id (used to look up merged symbol)
5740+
/** @internal */ parent?: Symbol; // Parent symbol
5741+
/** @internal */ exportSymbol?: Symbol; // Exported symbol associated with this symbol
5742+
/** @internal */ constEnumOnlyModule: boolean | undefined; // True if module contains only const enums or other modules with only const enums
57435743
/** @internal */ isReferenced?: SymbolFlags; // True if the symbol is referenced elsewhere. Keeps track of the meaning of a reference in case a symbol is both a type parameter and parameter.
57445744
/** @internal */ isReplaceableByMethod?: boolean; // Can this Javascript class property be replaced by a method symbol?
5745-
/** @internal */ isAssigned?: boolean; // True if the symbol is a parameter with assignments
5745+
/** @internal */ isAssigned?: boolean; // True if the symbol is a parameter with assignments
57465746
/** @internal */ assignmentDeclarationMembers?: Map<number, Declaration>; // detected late-bound assignment declarations associated with the symbol
57475747
}
57485748

@@ -5758,7 +5758,7 @@ export interface SymbolLinks {
57585758
declaredType?: Type; // Type of class, interface, enum, type alias, or type parameter
57595759
typeParameters?: TypeParameter[]; // Type parameters of type alias (undefined if non-generic)
57605760
outerTypeParameters?: TypeParameter[]; // Outer type parameters of anonymous object type
5761-
instantiations?: Map<string, Type>; // Instantiations of generic type alias (undefined if non-generic)
5761+
instantiations?: Map<string, Type>; // Instantiations of generic type alias (undefined if non-generic)
57625762
aliasSymbol?: Symbol; // Alias associated with generic type alias instantiation
57635763
aliasTypeArguments?: readonly Type[] // Alias type arguments (if any)
57645764
inferredClassSymbol?: Map<SymbolId, TransientSymbol>; // Symbol of an inferred ES5 constructor function
@@ -5831,23 +5831,38 @@ export const enum CheckFlags {
58315831
}
58325832

58335833
/** @internal */
5834-
export interface TransientSymbol extends Symbol, SymbolLinks {
5834+
export interface TransientSymbolLinks extends SymbolLinks {
58355835
checkFlags: CheckFlags;
58365836
}
58375837

58385838
/** @internal */
5839-
export interface MappedSymbol extends TransientSymbol {
5839+
export interface TransientSymbol extends Symbol {
5840+
links: TransientSymbolLinks;
5841+
}
5842+
5843+
/** @internal */
5844+
export interface MappedSymbolLinks extends TransientSymbolLinks {
58405845
mappedType: MappedType;
58415846
keyType: Type;
58425847
}
58435848

58445849
/** @internal */
5845-
export interface ReverseMappedSymbol extends TransientSymbol {
5850+
export interface MappedSymbol extends TransientSymbol {
5851+
links: MappedSymbolLinks;
5852+
}
5853+
5854+
/** @internal */
5855+
export interface ReverseMappedSymbolLinks extends TransientSymbolLinks {
58465856
propertyType: Type;
58475857
mappedType: MappedType;
58485858
constraintType: IndexType;
58495859
}
58505860

5861+
/** @internal */
5862+
export interface ReverseMappedSymbol extends TransientSymbol {
5863+
links: ReverseMappedSymbolLinks;
5864+
}
5865+
58515866
export const enum InternalSymbolName {
58525867
Call = "__call", // Call signatures
58535868
Constructor = "__constructor", // Constructor implementations

‎src/compiler/utilities.ts‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6821,7 +6821,7 @@ export function closeFileWatcher(watcher: FileWatcher) {
68216821

68226822
/** @internal */
68236823
export function getCheckFlags(symbol: Symbol): CheckFlags {
6824-
return symbol.flags & SymbolFlags.Transient ? (symbol as TransientSymbol).checkFlags : 0;
6824+
return symbol.flags & SymbolFlags.Transient ? (symbol as TransientSymbol).links.checkFlags : 0;
68256825
}
68266826

68276827
/** @internal */
@@ -6833,7 +6833,7 @@ export function getDeclarationModifierFlagsFromSymbol(s: Symbol, isWrite = false
68336833
return s.parent && s.parent.flags & SymbolFlags.Class ? flags : flags & ~ModifierFlags.AccessibilityModifier;
68346834
}
68356835
if (getCheckFlags(s) & CheckFlags.Synthetic) {
6836-
const checkFlags = (s as TransientSymbol).checkFlags;
6836+
const checkFlags = (s as TransientSymbol).links.checkFlags;
68376837
const accessModifier = checkFlags & CheckFlags.ContainsPrivate ? ModifierFlags.Private :
68386838
checkFlags & CheckFlags.ContainsPublic ? ModifierFlags.Public :
68396839
ModifierFlags.Protected;
@@ -7262,9 +7262,16 @@ function Symbol(this: Symbol, flags: SymbolFlags, name: __String) {
72627262
this.escapedName = name;
72637263
this.declarations = undefined;
72647264
this.valueDeclaration = undefined;
7265-
this.id = undefined;
7266-
this.mergeId = undefined;
7265+
this.id = 0;
7266+
this.mergeId = 0;
72677267
this.parent = undefined;
7268+
this.members = undefined;
7269+
this.exports = undefined;
7270+
this.exportSymbol = undefined;
7271+
this.constEnumOnlyModule = undefined;
7272+
this.isReferenced = undefined;
7273+
this.isAssigned = undefined;
7274+
(this as any).links = undefined; // used by TransientSymbol
72687275
}
72697276

72707277
function Type(this: Type, checker: TypeChecker, flags: TypeFlags) {

‎src/services/codefixes/fixInvalidImportSyntax.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ function getActionsForInvalidImportLocation(context: CodeFixContext): CodeFixAct
107107

108108
function getImportCodeFixesForExpression(context: CodeFixContext, expr: Node): CodeFixAction[] | undefined {
109109
const type = context.program.getTypeChecker().getTypeAtLocation(expr);
110-
if (!(type.symbol && (type.symbol as TransientSymbol).originatingImport)) {
110+
if (!(type.symbol && (type.symbol as TransientSymbol).links.originatingImport)) {
111111
return [];
112112
}
113113
const fixes: CodeFixAction[] = [];
114-
const relatedImport = (type.symbol as TransientSymbol).originatingImport!; // TODO: GH#18217
114+
const relatedImport = (type.symbol as TransientSymbol).links.originatingImport!; // TODO: GH#18217
115115
if (!isImportCall(relatedImport)) {
116116
addRange(fixes, getCodeFixesForImportDeclaration(context, relatedImport));
117117
}

‎src/services/codefixes/inferFromUsage.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ function inferTypeFromReferences(program: Program, references: readonly Identifi
10451045
const members = mapEntries(props, (name, types) => {
10461046
const isOptional = types.length < anons.length ? SymbolFlags.Optional : 0;
10471047
const s = checker.createSymbol(SymbolFlags.Property | isOptional, name as __String);
1048-
s.type = checker.getUnionType(types);
1048+
s.links.type = checker.getUnionType(types);
10491049
return [name, s];
10501050
});
10511051
const indexInfos = [];
@@ -1101,7 +1101,7 @@ function inferTypeFromReferences(program: Program, references: readonly Identifi
11011101
if (usage.properties) {
11021102
usage.properties.forEach((u, name) => {
11031103
const symbol = checker.createSymbol(SymbolFlags.Property, name);
1104-
symbol.type = combineFromUsage(u);
1104+
symbol.links.type = combineFromUsage(u);
11051105
members.set(name, symbol);
11061106
});
11071107
}
@@ -1221,7 +1221,7 @@ function inferTypeFromReferences(program: Program, references: readonly Identifi
12211221
const length = Math.max(...calls.map(c => c.argumentTypes.length));
12221222
for (let i = 0; i < length; i++) {
12231223
const symbol = checker.createSymbol(SymbolFlags.FunctionScopedVariable, escapeLeadingUnderscores(`arg${i}`));
1224-
symbol.type = combineTypes(calls.map(call => call.argumentTypes[i] || checker.getUndefinedType()));
1224+
symbol.links.type = combineTypes(calls.map(call => call.argumentTypes[i] || checker.getUndefinedType()));
12251225
if (calls.some(call => call.argumentTypes[i] === undefined)) {
12261226
symbol.flags |= SymbolFlags.Optional;
12271227
}

‎src/services/codefixes/returnValueCorrect.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ registerCodeFix({
120120

121121
function createObjectTypeFromLabeledExpression(checker: TypeChecker, label: Identifier, expression: Expression) {
122122
const member = checker.createSymbol(SymbolFlags.Property, label.escapedText);
123-
member.type = checker.getTypeAtLocation(expression);
123+
member.links.type = checker.getTypeAtLocation(expression);
124124
const members = createSymbolTable([member]);
125125
return checker.createAnonymousType(/*symbol*/ undefined, members, [], [], []);
126126
}

‎src/services/refactors/extractSymbol.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2124,7 +2124,7 @@ function collectReadsAndWrites(
21242124
const decl = find(visibleDeclarationsInExtractedRange, d => d.symbol === sym);
21252125
if (decl) {
21262126
if (isVariableDeclaration(decl)) {
2127-
const idString = decl.symbol.id!.toString();
2127+
const idString = decl.symbol.id.toString();
21282128
if (!exposedVariableSymbolSet.has(idString)) {
21292129
exposedVariableDeclarations.push(decl);
21302130
exposedVariableSymbolSet.set(idString, true);

‎src/services/services.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,9 @@ class SymbolObject implements Symbol {
615615
escapedName: __String;
616616
declarations!: Declaration[];
617617
valueDeclaration!: Declaration;
618+
id = 0;
619+
mergeId = 0;
620+
constEnumOnlyModule: boolean | undefined;
618621

619622
// Undefined is used to indicate the value has not been computed. If, after computing, the
620623
// symbol has no doc comment, then the empty array will be returned.
@@ -656,8 +659,8 @@ class SymbolObject implements Symbol {
656659
if (!this.documentationComment) {
657660
this.documentationComment = emptyArray; // Set temporarily to avoid an infinite loop finding inherited docs
658661

659-
if (!this.declarations && (this as Symbol as TransientSymbol).target && ((this as Symbol as TransientSymbol).target as TransientSymbol).tupleLabelDeclaration) {
660-
const labelDecl = ((this as Symbol as TransientSymbol).target as TransientSymbol).tupleLabelDeclaration!;
662+
if (!this.declarations && (this as Symbol as TransientSymbol).links.target && ((this as Symbol as TransientSymbol).links.target as TransientSymbol).links.tupleLabelDeclaration) {
663+
const labelDecl = ((this as Symbol as TransientSymbol).links.target as TransientSymbol).links.tupleLabelDeclaration!;
661664
this.documentationComment = getDocumentationComment([labelDecl], checker);
662665
}
663666
else {

‎src/services/signatureHelp.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ function itemInfoForParameters(candidateSignature: Signature, checker: TypeCheck
724724
const isVariadic: (parameterList: readonly Symbol[]) => boolean =
725725
!checker.hasEffectiveRestParameter(candidateSignature) ? _ => false
726726
: lists.length === 1 ? _ => true
727-
: pList => !!(pList.length && (pList[pList.length - 1] as TransientSymbol).checkFlags & CheckFlags.RestParameter);
727+
: pList => !!(pList.length && (pList[pList.length - 1] as TransientSymbol).links.checkFlags & CheckFlags.RestParameter);
728728
return lists.map(parameterList => ({
729729
isVariadic: isVariadic(parameterList),
730730
parameters: parameterList.map(p => createSignatureHelpParameterForParameter(p, checker, enclosingDeclaration, sourceFile, printer)),
@@ -739,7 +739,7 @@ function createSignatureHelpParameterForParameter(parameter: Symbol, checker: Ty
739739
printer.writeNode(EmitHint.Unspecified, param, sourceFile, writer);
740740
});
741741
const isOptional = checker.isOptionalParameter(parameter.valueDeclaration as ParameterDeclaration);
742-
const isRest = !!((parameter as TransientSymbol).checkFlags & CheckFlags.RestParameter);
742+
const isRest = !!((parameter as TransientSymbol).links.checkFlags & CheckFlags.RestParameter);
743743
return { name: parameter.name, documentation: parameter.getDocumentationComment(checker), displayParts, isOptional, isRest };
744744
}
745745

‎src/services/symbolDisplay.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ function getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(typeCheck
176176
if (flags & SymbolFlags.Signature) return ScriptElementKind.indexSignatureElement;
177177

178178
if (flags & SymbolFlags.Property) {
179-
if (flags & SymbolFlags.Transient && (symbol as TransientSymbol).checkFlags & CheckFlags.Synthetic) {
179+
if (flags & SymbolFlags.Transient && (symbol as TransientSymbol).links.checkFlags & CheckFlags.Synthetic) {
180180
// If union property is result of union of non method (property/accessors/variables), it is labeled as property
181181
const unionPropertyKind = forEach(typeChecker.getRootSymbols(symbol), rootSymbol => {
182182
const rootSymbolFlags = rootSymbol.getFlags();
@@ -645,8 +645,8 @@ export function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker: Typ
645645
else {
646646
addRange(displayParts, typeToDisplayParts(typeChecker, type, enclosingDeclaration));
647647
}
648-
if ((symbol as TransientSymbol).target && ((symbol as TransientSymbol).target as TransientSymbol).tupleLabelDeclaration) {
649-
const labelDecl = ((symbol as TransientSymbol).target as TransientSymbol).tupleLabelDeclaration!;
648+
if ((symbol as TransientSymbol).links.target && ((symbol as TransientSymbol).links.target as TransientSymbol).links.tupleLabelDeclaration) {
649+
const labelDecl = ((symbol as TransientSymbol).links.target as TransientSymbol).links.tupleLabelDeclaration!;
650650
Debug.assertNode(labelDecl.name, isIdentifier);
651651
displayParts.push(spacePart());
652652
displayParts.push(punctuationPart(SyntaxKind.OpenParenToken));

0 commit comments

Comments
 (0)