Skip to content

Commit 1971964

Browse files
committed
Fix nil exception on inferred projects
1 parent 3f60807 commit 1971964

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

internal/project/service_test.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,15 @@ func TestService(t *testing.T) {
223223

224224
t.Run("change open file", func(t *testing.T) {
225225
t.Parallel()
226-
service, host := setup(files)
226+
service, host := projecttestutil.Setup(files)
227227
service.OpenFile("/home/projects/TS/p1/src/x.ts", files["/home/projects/TS/p1/src/x.ts"], core.ScriptKindTS, "")
228228
service.OpenFile("/home/projects/TS/p1/src/index.ts", files["/home/projects/TS/p1/src/index.ts"], core.ScriptKindTS, "")
229229
_, project := service.EnsureDefaultProjectForFile("/home/projects/TS/p1/src/index.ts")
230230
programBefore := project.GetProgram()
231231

232232
filesCopy := maps.Clone(files)
233233
filesCopy["/home/projects/TS/p1/src/x.ts"] = `export const x = 2;`
234-
host.replaceFS(filesCopy)
234+
host.ReplaceFS(filesCopy)
235235
service.OnWatchedFilesChanged([]lsproto.FileEvent{
236236
{
237237
Type: lsproto.FileChangeTypeChanged,
@@ -244,14 +244,14 @@ func TestService(t *testing.T) {
244244

245245
t.Run("change closed program file", func(t *testing.T) {
246246
t.Parallel()
247-
service, host := setup(files)
247+
service, host := projecttestutil.Setup(files)
248248
service.OpenFile("/home/projects/TS/p1/src/index.ts", files["/home/projects/TS/p1/src/index.ts"], core.ScriptKindTS, "")
249249
_, project := service.EnsureDefaultProjectForFile("/home/projects/TS/p1/src/index.ts")
250250
programBefore := project.GetProgram()
251251

252252
filesCopy := maps.Clone(files)
253253
filesCopy["/home/projects/TS/p1/src/x.ts"] = `export const x = 2;`
254-
host.replaceFS(filesCopy)
254+
host.ReplaceFS(filesCopy)
255255
service.OnWatchedFilesChanged([]lsproto.FileEvent{
256256
{
257257
Type: lsproto.FileChangeTypeChanged,
@@ -277,7 +277,7 @@ func TestService(t *testing.T) {
277277
let y: number = x;`,
278278
}
279279

280-
service, host := setup(files)
280+
service, host := projecttestutil.Setup(files)
281281
service.OpenFile("/home/projects/TS/p1/src/index.ts", files["/home/projects/TS/p1/src/index.ts"], core.ScriptKindTS, "")
282282
_, project := service.EnsureDefaultProjectForFile("/home/projects/TS/p1/src/index.ts")
283283
program := project.GetProgram()
@@ -290,7 +290,7 @@ func TestService(t *testing.T) {
290290
"strict": true
291291
}
292292
}`
293-
host.replaceFS(filesCopy)
293+
host.ReplaceFS(filesCopy)
294294
service.OnWatchedFilesChanged([]lsproto.FileEvent{
295295
{
296296
Type: lsproto.FileChangeTypeChanged,
@@ -314,15 +314,15 @@ func TestService(t *testing.T) {
314314
"/home/projects/TS/p1/src/x.ts": `export declare const x: number | undefined;`,
315315
"/home/projects/TS/p1/src/index.ts": `import { x } from "./x";`,
316316
}
317-
service, host := setup(files)
317+
service, host := projecttestutil.Setup(files)
318318
service.OpenFile("/home/projects/TS/p1/src/index.ts", files["/home/projects/TS/p1/src/index.ts"], core.ScriptKindTS, "")
319319
_, project := service.EnsureDefaultProjectForFile("/home/projects/TS/p1/src/index.ts")
320320
program := project.GetProgram()
321321
assert.Equal(t, len(program.GetSemanticDiagnostics(program.GetSourceFile("/home/projects/TS/p1/src/index.ts"))), 0)
322322

323323
filesCopy := maps.Clone(files)
324324
delete(filesCopy, "/home/projects/TS/p1/src/x.ts")
325-
host.replaceFS(filesCopy)
325+
host.ReplaceFS(filesCopy)
326326
service.OnWatchedFilesChanged([]lsproto.FileEvent{
327327
{
328328
Type: lsproto.FileChangeTypeDeleted,
@@ -347,15 +347,15 @@ func TestService(t *testing.T) {
347347
"/home/projects/TS/p1/src/index.ts": `let x = 2;`,
348348
"/home/projects/TS/p1/src/x.ts": `let y = x;`,
349349
}
350-
service, host := setup(files)
350+
service, host := projecttestutil.Setup(files)
351351
service.OpenFile("/home/projects/TS/p1/src/x.ts", files["/home/projects/TS/p1/src/x.ts"], core.ScriptKindTS, "")
352352
_, project := service.EnsureDefaultProjectForFile("/home/projects/TS/p1/src/x.ts")
353353
program := project.GetProgram()
354354
assert.Equal(t, len(program.GetSemanticDiagnostics(program.GetSourceFile("/home/projects/TS/p1/src/x.ts"))), 0)
355355

356356
filesCopy := maps.Clone(files)
357357
delete(filesCopy, "/home/projects/TS/p1/src/index.ts")
358-
host.replaceFS(filesCopy)
358+
host.ReplaceFS(filesCopy)
359359
service.OnWatchedFilesChanged([]lsproto.FileEvent{
360360
{
361361
Type: lsproto.FileChangeTypeDeleted,
@@ -378,7 +378,7 @@ func TestService(t *testing.T) {
378378
}`,
379379
"/home/projects/TS/p1/src/index.ts": `import { y } from "./y";`,
380380
}
381-
service, host := setup(files)
381+
service, host := projecttestutil.Setup(files)
382382
service.OpenFile("/home/projects/TS/p1/src/index.ts", files["/home/projects/TS/p1/src/index.ts"], core.ScriptKindTS, "")
383383
_, project := service.EnsureDefaultProjectForFile("/home/projects/TS/p1/src/index.ts")
384384
program := project.GetProgram()
@@ -389,7 +389,7 @@ func TestService(t *testing.T) {
389389
// Add the missing file
390390
filesCopy := maps.Clone(files)
391391
filesCopy["/home/projects/TS/p1/src/y.ts"] = `export const y = 1;`
392-
host.replaceFS(filesCopy)
392+
host.ReplaceFS(filesCopy)
393393
service.OnWatchedFilesChanged([]lsproto.FileEvent{
394394
{
395395
Type: lsproto.FileChangeTypeCreated,
@@ -414,7 +414,7 @@ func TestService(t *testing.T) {
414414
}`,
415415
"/home/projects/TS/p1/src/index.ts": `import { z } from "./z";`,
416416
}
417-
service, host := setup(files)
417+
service, host := projecttestutil.Setup(files)
418418
service.OpenFile("/home/projects/TS/p1/src/index.ts", files["/home/projects/TS/p1/src/index.ts"], core.ScriptKindTS, "")
419419
_, project := service.EnsureDefaultProjectForFile("/home/projects/TS/p1/src/index.ts")
420420
program := project.GetProgram()
@@ -425,7 +425,7 @@ func TestService(t *testing.T) {
425425
// Add a new file through wildcard inclusion
426426
filesCopy := maps.Clone(files)
427427
filesCopy["/home/projects/TS/p1/src/z.ts"] = `export const z = 1;`
428-
host.replaceFS(filesCopy)
428+
host.ReplaceFS(filesCopy)
429429
service.OnWatchedFilesChanged([]lsproto.FileEvent{
430430
{
431431
Type: lsproto.FileChangeTypeCreated,

0 commit comments

Comments
 (0)