Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d2c0ec7

Browse filesBrowse files
committed
JS:resolve nested static classes+on func/class exps
1. In Javascript, support type references to class expressions whose name is obtained via "static property assignment" to another class like so: ```ts function Outer() { this.y = 2 } Outer.Inner = class { } /** @type {Outer.Inner} */ var inner; ``` 2. In Javascript, support type references to properties of function and class expressions that are assigned to a variable, like so: ```ts var Outer = function { this.y = 2 } Outer.Inner = class { } /** @type {Outer.Inner} */ var inner; ```
1 parent 6c4c10c commit d2c0ec7
Copy full SHA for d2c0ec7

2 files changed

+13-2Lines changed: 13 additions & 2 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎src/compiler/checker.ts‎

Copy file name to clipboardExpand all lines: src/compiler/checker.ts
+12-1Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1733,13 +1733,24 @@ namespace ts {
17331733
return undefined;
17341734
}
17351735
const right = name.kind === SyntaxKind.QualifiedName ? name.right : name.name;
1736-
const namespace = resolveEntityName(left, SymbolFlags.Namespace, ignoreErrors, /*dontResolveAlias*/ false, location);
1736+
let namespace = resolveEntityName(left, SymbolFlags.Namespace, /*ignoreErrors*/ true, /*dontResolveAlias*/ false, location);
1737+
if (!namespace && name.parent && isJSDocTypeReference(name.parent as TypeReferenceType)) {
1738+
// jsdoc type references may be values
1739+
namespace = resolveEntityName(left, SymbolFlags.Value, ignoreErrors, /*dontResolveAlias*/ false, location);
1740+
}
1741+
else if (!ignoreErrors) {
1742+
// run again for error reporting purposes
1743+
resolveEntityName(left, SymbolFlags.Namespace, /*ignoreErrors*/ false, /*dontResolveAlias*/ false, location);
1744+
}
17371745
if (!namespace || nodeIsMissing(right)) {
17381746
return undefined;
17391747
}
17401748
else if (namespace === unknownSymbol) {
17411749
return namespace;
17421750
}
1751+
if (isInJavaScriptFile(name) && isDeclarationOfFunctionOrClassExpression(namespace)) {
1752+
namespace = getSymbolOfNode((namespace.valueDeclaration as VariableDeclaration).initializer);
1753+
}
17431754
symbol = getSymbol(getExportsOfSymbol(namespace), right.escapedText, meaning);
17441755
if (!symbol) {
17451756
if (!ignoreErrors) {
Collapse file

‎src/compiler/utilities.ts‎

Copy file name to clipboardExpand all lines: src/compiler/utilities.ts
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,7 @@ namespace ts {
14351435
}
14361436

14371437
/**
1438-
* Returns true if the node is a variable declaration whose initializer is a function expression.
1438+
* Returns true if the node is a variable declaration whose initializer is a function or class expression.
14391439
* This function does not test if the node is in a JavaScript file or not.
14401440
*/
14411441
export function isDeclarationOfFunctionOrClassExpression(s: Symbol) {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.