Skip to content

Commit d2c5168

Browse files
committed
cast to FullSouceFile for more robust unstable ts typechecking
1 parent 37bb04b commit d2c5168

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

typescript/src/codeFixes.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
173173
const program = languageService.getProgram()!
174174
const sourceFile = program.getSourceFile(fileName)!
175175
const importAdder = tsFull.codefix.createImportAdder(
176-
sourceFile as any,
176+
sourceFile as FullSourceFile,
177177
program as any,
178178
preferences,
179179
languageServiceHost as any /* cancellationToken */,
@@ -258,7 +258,7 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
258258
),
259259
)
260260
try {
261-
importAdder.addImportFromDiagnostic({ ...diagnostic, file: sourceFile as any } as any, context)
261+
importAdder.addImportFromDiagnostic({ ...diagnostic, file: sourceFile as FullSourceFile } as any, context)
262262
} catch (err) {
263263
if (err.message === 'No fixes') continue
264264
throw err

typescript/src/completionsAtPosition.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ export const getCompletionsAtPosition = (
6666
if (!scriptSnapshot || isInBannedPosition(position, scriptSnapshot, sourceFile)) return
6767
const exactNode = findChildContainingExactPosition(sourceFile, position)
6868
const isCheckedFile =
69-
!tsFull.isSourceFileJS(sourceFile as any) || !!tsFull.isCheckJsEnabledForFile(sourceFile as any, additionalData.compilerOptions as any)
69+
!tsFull.isSourceFileJS(sourceFile as FullSourceFile) ||
70+
!!tsFull.isCheckJsEnabledForFile(sourceFile as FullSourceFile, additionalData.compilerOptions as any)
7071
Object.assign(sharedCompletionContext, {
7172
position,
7273
languageService,

typescript/src/namespaceAutoImports.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export default (
6161
)
6262
const changeTracker = getChangesTracker(formatOptions)
6363
// todo respect sorting?
64-
changeTracker.insertNodeAtTopOfFile(sourceFile as any, importDeclaration as any, true)
64+
changeTracker.insertNodeAtTopOfFile(sourceFile as FullSourceFile, importDeclaration as any, true)
6565
const changes = changeTracker.getChanges()
6666
const { textChanges: importTextChanges } = changes[0]!
6767
textChanges.unshift(...importTextChanges)

0 commit comments

Comments
 (0)