microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-10 15:25:54 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

documentHighlights: Handle some invalid modifier locations (#21893)

Browse Source
This commit is contained in:
Andy 2018-02-12 11:34:49 -08:00 committed by GitHub
parent 2d80253d09
commit fcf348610c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/services/documentHighlights.ts
View File

@ -200,7 +200,8 @@ namespace ts.DocumentHighlights {
}
function getNodesToSearchForModifier(declaration: Node, modifierFlag: ModifierFlags): ReadonlyArray<Node> {
const container = declaration.parent;
// Types of node whose children might have modifiers.
const container = declaration.parent as ModuleBlock | SourceFile | Block | CaseClause | DefaultClause | ConstructorDeclaration | MethodDeclaration | FunctionDeclaration | ClassLikeDeclaration;
switch (container.kind) {
case SyntaxKind.ModuleBlock:
case SyntaxKind.SourceFile:
@ -212,18 +213,21 @@ namespace ts.DocumentHighlights {
return [...declaration.members, declaration];
}
else {
return (<ModuleBlock | SourceFile | Block | CaseClause | DefaultClause>container).statements;
return container.statements;
}
case SyntaxKind.Constructor:
return [...(<ConstructorDeclaration>container).parameters, ...(<ClassDeclaration>container.parent).members];
case SyntaxKind.MethodDeclaration:
case SyntaxKind.FunctionDeclaration: {
return [...container.parameters, ...(isClassLike(container.parent) ? container.parent.members : [])];
}
case SyntaxKind.ClassDeclaration:
case SyntaxKind.ClassExpression:
const nodes = (<ClassLikeDeclaration>container).members;
const nodes = container.members;
// If we're an accessibility modifier, we're in an instance member and should search
// the constructor's parameter list for instance members as well.
if (modifierFlag & ModifierFlags.AccessibilityModifier) {
const constructor = find((<ClassLikeDeclaration>container).members, isConstructorDeclaration);
const constructor = find(container.members, isConstructorDeclaration);
if (constructor) {
return [...nodes, ...constructor.parameters];
}
@ -233,7 +237,7 @@ namespace ts.DocumentHighlights {
}
return nodes;
default:
Debug.fail("Invalid container kind.");
Debug.assertNever(container, "Invalid container kind.");
}
}

10
tests/cases/fourslash/documentHighlightsInvalidModifierLocations.ts Normal file
View File

@ -0,0 +1,10 @@
/// <reference path="fourslash.ts" />
////class C {
//// m([|readonly|] p) {}
////}
////function f([|readonly|] p) {}
for (const r of test.ranges()) {
verify.documentHighlightsOf(r, [r]);
}