Skip to content

Commit 4738035

Browse files
committed
refactor & prepare codebase for a few next prs
kill ts server attach on ext kill
1 parent 87f1a33 commit 4738035

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

.vscode/launch.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
"${workspaceFolder}/out/**/*.js"
1515
],
1616
"sourceMaps": true,
17+
"cascadeTerminateToConfigurations": [
18+
"Attach to TS Server",
19+
],
1720
"env": {
1821
"TSS_DEBUG": "9223",
1922
"TSS_REMOTE_DEBUG": "9223"

typescript/src/completions/sharedContext.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ export const sharedCompletionContext = {} as unknown as Readonly<{
1515
formatOptions: ts.FormatCodeSettings
1616
preferences: ts.UserPreferences
1717
fullText: string
18+
typeChecker: ts.TypeChecker
1819
// languageServiceHost: ts.LanguageServiceHost
1920
}>

typescript/src/completionsAtPosition.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ export const getCompletionsAtPosition = (
141141
preferences: options || {},
142142
prior: prior!,
143143
fullText: sourceFile.getFullText(),
144+
typeChecker: program.getTypeChecker(),
144145
} satisfies typeof sharedCompletionContext)
145146

146147
if (node && !hasSuggestions && ensurePrior() && prior) {

typescript/src/references.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@ export default (proxy: ts.LanguageService, languageService: ts.LanguageService,
1313
}
1414
if (c('removeImportsFromReferences')) {
1515
const program = languageService.getProgram()!
16-
const importsCountPerFileName: Record<
16+
const refCountPerFileName: Record<
1717
string,
1818
{
19-
all: number
20-
cur: number
19+
total: number
20+
current: number
2121
}
2222
> = {}
2323
const allReferences = prior.flatMap(({ references }) => references)
2424
for (const { fileName } of allReferences) {
25-
importsCountPerFileName[fileName] ??= {
26-
all: 0,
27-
cur: 0,
25+
refCountPerFileName[fileName] ??= {
26+
total: 0,
27+
current: 0,
2828
}
29-
importsCountPerFileName[fileName]!.all++
29+
refCountPerFileName[fileName]!.total++
3030
}
3131
prior = prior.map(({ references, ...other }) => {
3232
return {
3333
...other,
3434
references: references.filter(({ fileName, textSpan }) => {
35-
const importsCount = importsCountPerFileName[fileName]!
35+
const refsCount = refCountPerFileName[fileName]!
3636
// doesn't make sense to handle case where it gets imports twice
37-
if (importsCount.all <= 1 || importsCount.cur !== 0) return true
38-
importsCount.cur++
37+
if (refsCount.total <= 1 || refsCount.current !== 0) return true
38+
refsCount.current++
3939
const sourceFile = program.getSourceFile(fileName)
4040
if (!sourceFile) return true
4141
const end = textSpan.start + textSpan.length

0 commit comments

Comments
 (0)