Skip to content

Commit 4973852

Browse files
committed
fix linter errors
1 parent 6bd35fb commit 4973852

File tree

4 files changed

+20
-46
lines changed

4 files changed

+20
-46
lines changed

src/compiler/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2257,7 +2257,7 @@ namespace ts {
22572257
getNonNullableType(type: Type): Type;
22582258
getIntersectionType(types: Type[], aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type;
22592259
getUnionType(types: Type[], subtypeReduction?: boolean, aliasSymbol?: Symbol, aliasTypeArguments?: Type[]): Type;
2260-
2260+
22612261
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
22622262
getSymbolOfNode(node: Node): Symbol;
22632263
getSymbolAtLocation(node: Node): Symbol;

src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace ts.codefix {
88
const token = getTokenAtPosition(sourceFile, start);
99
const checker = context.program.getTypeChecker();
1010

11-
if (token.kind === SyntaxKind.Identifier && isClassLike(token.parent)) {
11+
if (token.kind === SyntaxKind.Identifier && isClassLike(token.parent)) {
1212
const classDeclaration = <ClassDeclaration>token.parent;
1313
const startPos = classDeclaration.members.pos;
1414
// const abstractClassMembers = ts.map(getNamedAbstractClassMembers(classDeclaration), member => member.name.getText());
@@ -22,9 +22,9 @@ namespace ts.codefix {
2222
changes: [{
2323
fileName: sourceFile.fileName,
2424
textChanges: [{
25-
span: {start: startPos, length: 0},
26-
newText: insertion
27-
}]
25+
span: { start: startPos, length: 0 },
26+
newText: insertion
27+
}]
2828
}]
2929
}];
3030
}

src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace ts.codefix {
1414

1515
const insertion = getMissingInterfaceMembersInsertion(classDeclaration, checker, context.newLineCharacter);
1616

17-
if(insertion && insertion.length) {
17+
if (insertion && insertion.length) {
1818
return [{
1919
description: getLocaleSpecificMessage(Diagnostics.Implement_interface_on_class),
2020
changes: [{

src/services/utilities.ts

Lines changed: 14 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,22 +1364,12 @@ namespace ts {
13641364
if (!baseTypeNode) {
13651365
return "";
13661366
}
1367-
1367+
13681368
const classSymbol = checker.getSymbolOfNode(classDecl);
13691369

13701370
const InstantiatedExtendsType = <InterfaceType>checker.getTypeFromTypeReference(getClassExtendsHeritageClauseElement(classDecl));
13711371
const resolvedExtendsType = checker.resolveStructuredTypeMembers(InstantiatedExtendsType);
13721372

1373-
// TODO: (arozga) Should we use the above or this to get the type of the extended class?
1374-
/*
1375-
const classType = <InterfaceType>checker.getTypeOfSymbol(classSymbol);
1376-
let baseType = checker.getBaseTypes(classType)[0];
1377-
const resolvedBaseType = checker.resolveStructuredTypeMembers(baseType);
1378-
if (baseType.objectFlags & ObjectFlags.Reference) {
1379-
baseType = checker.getTypeFromTypeReference(<TypeReference>baseType);
1380-
}
1381-
*/
1382-
13831373
const missingMembers = filterMissingMembers(filterAbstract(filterNonPrivate(resolvedExtendsType.members)), classSymbol.members);
13841374

13851375
return getInsertionsForMembers(missingMembers, classDecl, checker, newlineChar);
@@ -1394,14 +1384,14 @@ namespace ts {
13941384
const classSymbol = checker.getSymbolOfNode(classDecl);
13951385

13961386
let implementsIntersectionType: IntersectionType | InterfaceType;
1397-
if(implementedTypeNodes.length > 1) {
1387+
if (implementedTypeNodes.length > 1) {
13981388
implementsIntersectionType = <IntersectionType>checker.getIntersectionType(implementedTypeNodes.map(checker.getTypeFromTypeReference));
13991389
}
14001390
else {
14011391
implementsIntersectionType = <InterfaceType>checker.getTypeFromTypeReference(implementedTypeNodes[0]);
14021392
}
14031393

1404-
const structuredType = checker.resolveStructuredTypeMembers(<IntersectionType | InterfaceType>implementsIntersectionType);
1394+
const structuredType = checker.resolveStructuredTypeMembers(<IntersectionType | InterfaceType>implementsIntersectionType);
14051395
const missingMembers = filterMissingMembers(filterNonPrivate(structuredType.members), classSymbol.members);
14061396
return getInsertionsForMembers(missingMembers, classDecl, checker, newlineChar);
14071397
}
@@ -1410,11 +1400,11 @@ namespace ts {
14101400
* Finds the symbols in source but not target, generating a new map with the differences.
14111401
*/
14121402
function filterMissingMembers(sourceSymbols: Map<Symbol>, targetSymbols: Map<Symbol>): Map<Symbol> {
1413-
let result: Map<Symbol> = createMap<Symbol>();
1403+
const result: Map<Symbol> = createMap<Symbol>();
14141404
outer:
1415-
for(const sourceName in sourceSymbols) {
1416-
for(const targetName in targetSymbols) {
1417-
if(sourceName === targetName) {
1405+
for (const sourceName in sourceSymbols) {
1406+
for (const targetName in targetSymbols) {
1407+
if (sourceName === targetName) {
14181408
continue outer;
14191409
}
14201410
}
@@ -1424,7 +1414,7 @@ namespace ts {
14241414
}
14251415

14261416
function filterSymbolMapByDecl(symbolMap: Map<Symbol>, pred: (decl: Declaration) => boolean): Map<Symbol> {
1427-
let result = createMap<Symbol>();
1417+
const result = createMap<Symbol>();
14281418
for (const key in symbolMap) {
14291419
const decl = symbolMap[key].getDeclarations();
14301420
Debug.assert(!!(decl && decl.length));
@@ -1436,8 +1426,6 @@ namespace ts {
14361426
}
14371427

14381428
function filterAbstract(symbolMap: Map<Symbol>) {
1439-
// TODO: (arozga) use first or second?
1440-
// return mapObject(symbolMap, (key, val) => getModifierFlags(val.getDeclarations()[0]) & ModifierFlags.Abstract ? [key, val]: [undefined, undefined] );
14411429
return filterSymbolMapByDecl(symbolMap, decl => !!(getModifierFlags(decl) & ModifierFlags.Abstract));
14421430
}
14431431

@@ -1447,17 +1435,17 @@ namespace ts {
14471435

14481436
function getInsertionsForMembers(symbolMap: MapLike<Symbol>, enclosingDeclaration: ClassDeclaration, checker: TypeChecker, newlineChar: string): string {
14491437
let insertion = "";
1450-
1438+
14511439
for (const symbolName in symbolMap) {
14521440
insertion = insertion.concat(getInsertionForMemberSymbol(symbolMap[symbolName], enclosingDeclaration, checker, newlineChar));
14531441
}
14541442
return insertion;
14551443
}
14561444

14571445
function getInsertionForMemberSymbol(symbol: Symbol, enclosingDeclaration: ClassDeclaration, checker: TypeChecker, newlineChar: string): string {
1458-
const name = symbol.getName();
1459-
const type = checker.getTypeOfSymbol(symbol);
1460-
1446+
const name = symbol.getName();
1447+
const type = checker.getTypeOfSymbol(symbol);
1448+
14611449
const decls = symbol.getDeclarations();
14621450
if (!(decls && decls.length)) {
14631451
return "";
@@ -1473,7 +1461,7 @@ namespace ts {
14731461
case SyntaxKind.MethodSignature:
14741462
case SyntaxKind.MethodDeclaration:
14751463
const sigs = checker.getSignaturesOfType(type, SignatureKind.Call);
1476-
if(!(sigs && sigs.length > 0)) {
1464+
if (!(sigs && sigs.length > 0)) {
14771465
return "";
14781466
}
14791467
// TODO: (arozga) Deal with multiple signatures.
@@ -1489,20 +1477,6 @@ namespace ts {
14891477
return `{${newLineChar}throw new Error('Method not Implemented');${newLineChar}}${newLineChar}`;
14901478
}
14911479

1492-
/**
1493-
* Flattens params into a comma-separated list, sandwiched by prefix
1494-
* and suffix on either end.
1495-
*/
1496-
/*
1497-
function getCommaSeparatedString(params: string[], prefix: string, suffix: string) {
1498-
let result = prefix;
1499-
for (let i = 0; params && i < params.length; ++i) {
1500-
result += (i > 0 ? "," : "") + params[i];
1501-
}
1502-
return result + suffix;
1503-
}
1504-
*/
1505-
15061480
function getVisibilityPrefix(flags: ModifierFlags): string {
15071481
if (flags & ModifierFlags.Public) {
15081482
return "public ";
@@ -1517,4 +1491,4 @@ namespace ts {
15171491
// First token is the open curly, this is where we want to put the 'super' call.
15181492
return constructor.body.getFirstToken(sourceFile).getEnd();
15191493
}
1520-
}
1494+
}

0 commit comments

Comments
 (0)