Skip to content

Commit f4834c0

Browse files
hardfisthardfist
authored
chore: add project shim (#237)
1 parent 509cbb7 commit f4834c0

File tree

41 files changed

+180
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+180
-64
lines changed

‎cmd/rslint/lsp.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/microsoft/typescript-go/shim/compiler"
1717
"github.com/microsoft/typescript-go/shim/ls"
1818
"github.com/microsoft/typescript-go/shim/lsp/lsproto"
19+
"github.com/microsoft/typescript-go/shim/project"
1920
"github.com/microsoft/typescript-go/shim/scanner"
2021
"github.com/microsoft/typescript-go/shim/vfs"
2122
"github.com/microsoft/typescript-go/shim/vfs/cachedvfs"
@@ -37,6 +38,9 @@ type LSPServer struct {
3738
rootURI string
3839
documents map[lsproto.DocumentUri]string // URI -> content
3940
diagnostics map[lsproto.DocumentUri][]rule.RuleDiagnostic // URI -> diagnostics
41+
// align with https://github.com/microsoft/typescript-go/blob/5cdf239b02006783231dd4da8ca125cef398cd27/internal/lsp/server.go#L147
42+
//nolint
43+
projectService *project.Service
4044
}
4145

4246
func NewLSPServer() *LSPServer {

‎go.mod

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ replace (
1313
github.com/microsoft/typescript-go/shim/core => ./shim/core
1414
github.com/microsoft/typescript-go/shim/ls => ./shim/ls
1515
github.com/microsoft/typescript-go/shim/lsp/lsproto => ./shim/lsp/lsproto
16+
github.com/microsoft/typescript-go/shim/project => ./shim/project
1617
github.com/microsoft/typescript-go/shim/scanner => ./shim/scanner
1718
github.com/microsoft/typescript-go/shim/tsoptions => ./shim/tsoptions
1819
github.com/microsoft/typescript-go/shim/tspath => ./shim/tspath
@@ -30,13 +31,14 @@ require (
3031
github.com/microsoft/typescript-go/shim/collections v0.0.0
3132
github.com/microsoft/typescript-go/shim/compiler v0.0.0
3233
github.com/microsoft/typescript-go/shim/core v0.0.0
34+
github.com/microsoft/typescript-go/shim/ls v0.0.0
3335
github.com/microsoft/typescript-go/shim/lsp/lsproto v0.0.0
36+
github.com/microsoft/typescript-go/shim/project v0.0.0
3437
github.com/microsoft/typescript-go/shim/scanner v0.0.0
3538
github.com/microsoft/typescript-go/shim/tsoptions v0.0.0
3639
github.com/microsoft/typescript-go/shim/tspath v0.0.0
3740
github.com/microsoft/typescript-go/shim/vfs v0.0.0
3841
github.com/microsoft/typescript-go/shim/vfs/cachedvfs v0.0.0
39-
github.com/microsoft/typescript-go/shim/ls v0.0.0
4042
github.com/microsoft/typescript-go/shim/vfs/osvfs v0.0.0
4143
github.com/tailscale/hujson v0.0.0-20250605163823-992244df8c5a
4244
golang.org/x/sys v0.35.0
@@ -55,7 +57,7 @@ require (
5557
require (
5658
github.com/dlclark/regexp2 v1.11.5 // indirect
5759
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 // indirect
58-
github.com/microsoft/typescript-go v0.0.0-20250808210900-e087a3e09d31 // indirect
60+
github.com/microsoft/typescript-go v0.0.0-20250812073229-cedc0cbe6c18 // indirect
5961
github.com/sourcegraph/jsonrpc2 v0.2.1
6062
golang.org/x/text v0.27.0
6163
)

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk
1515
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
1616
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
1717
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
18-
github.com/microsoft/typescript-go v0.0.0-20250808210900-e087a3e09d31 h1:XVDhbpkA3VViwFWLuul/+mUFxRrashIbMKGiNWpaqrU=
19-
github.com/microsoft/typescript-go v0.0.0-20250808210900-e087a3e09d31/go.mod h1:EilU3HRKGhtWtFbO/cguqAte4JAgtaqbepoL9vzr/Do=
18+
github.com/microsoft/typescript-go v0.0.0-20250812073229-cedc0cbe6c18 h1:tnLEMPlvJzwbOXXiXjaVxzYwF7zOpB4Lgh9TAN6YhSs=
19+
github.com/microsoft/typescript-go v0.0.0-20250812073229-cedc0cbe6c18/go.mod h1:EilU3HRKGhtWtFbO/cguqAte4JAgtaqbepoL9vzr/Do=
2020
github.com/peter-evans/patience v0.3.0 h1:rX0JdJeepqdQl1Sk9c9uvorjYYzL2TfgLX1adqYm9cA=
2121
github.com/peter-evans/patience v0.3.0/go.mod h1:Kmxu5sY1NmBLFSStvXjX1wS9mIv7wMcP/ubucyMOAu0=
2222
github.com/sourcegraph/jsonrpc2 v0.2.1 h1:2GtljixMQYUYCmIg7W9aF2dFmniq/mOr2T9tFRh6zSQ=

‎internal/lsp/service.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package lsp

‎shim/ast/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.2
44

55
toolchain go1.24.4
66

7-
require github.com/microsoft/typescript-go v0.0.0-20250808210900-e087a3e09d31
7+
require github.com/microsoft/typescript-go v0.0.0-20250812073229-cedc0cbe6c18
88

99
require (
1010
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 // indirect

‎shim/ast/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 h1:iizUGZ9
22
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
33
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
44
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
5-
github.com/microsoft/typescript-go v0.0.0-20250808210900-e087a3e09d31 h1:XVDhbpkA3VViwFWLuul/+mUFxRrashIbMKGiNWpaqrU=
6-
github.com/microsoft/typescript-go v0.0.0-20250808210900-e087a3e09d31/go.mod h1:EilU3HRKGhtWtFbO/cguqAte4JAgtaqbepoL9vzr/Do=
5+
github.com/microsoft/typescript-go v0.0.0-20250812073229-cedc0cbe6c18 h1:tnLEMPlvJzwbOXXiXjaVxzYwF7zOpB4Lgh9TAN6YhSs=
6+
github.com/microsoft/typescript-go v0.0.0-20250812073229-cedc0cbe6c18/go.mod h1:EilU3HRKGhtWtFbO/cguqAte4JAgtaqbepoL9vzr/Do=
77
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
88
golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
99
gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=

‎shim/bundled/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.2
44

55
toolchain go1.24.4
66

7-
require github.com/microsoft/typescript-go v0.0.0-20250808210900-e087a3e09d31
7+
require github.com/microsoft/typescript-go v0.0.0-20250812073229-cedc0cbe6c18
88

99
require (
1010
github.com/dlclark/regexp2 v1.11.5 // indirect

‎shim/bundled/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 h1:iizUGZ9
44
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
55
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
66
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
7-
github.com/microsoft/typescript-go v0.0.0-20250808210900-e087a3e09d31 h1:XVDhbpkA3VViwFWLuul/+mUFxRrashIbMKGiNWpaqrU=
8-
github.com/microsoft/typescript-go v0.0.0-20250808210900-e087a3e09d31/go.mod h1:EilU3HRKGhtWtFbO/cguqAte4JAgtaqbepoL9vzr/Do=
7+
github.com/microsoft/typescript-go v0.0.0-20250812073229-cedc0cbe6c18 h1:tnLEMPlvJzwbOXXiXjaVxzYwF7zOpB4Lgh9TAN6YhSs=
8+
github.com/microsoft/typescript-go v0.0.0-20250812073229-cedc0cbe6c18/go.mod h1:EilU3HRKGhtWtFbO/cguqAte4JAgtaqbepoL9vzr/Do=
99
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
1010
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
1111
golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=

‎shim/checker/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.2
44

55
toolchain go1.24.4
66

7-
require github.com/microsoft/typescript-go v0.0.0-20250808210900-e087a3e09d31
7+
require github.com/microsoft/typescript-go v0.0.0-20250812073229-cedc0cbe6c18
88

99
require (
1010
github.com/dlclark/regexp2 v1.11.5 // indirect

‎shim/checker/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2 h1:iizUGZ9
44
github.com/go-json-experiment/json v0.0.0-20250725192818-e39067aee2d2/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
55
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
66
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
7-
github.com/microsoft/typescript-go v0.0.0-20250808210900-e087a3e09d31 h1:XVDhbpkA3VViwFWLuul/+mUFxRrashIbMKGiNWpaqrU=
8-
github.com/microsoft/typescript-go v0.0.0-20250808210900-e087a3e09d31/go.mod h1:EilU3HRKGhtWtFbO/cguqAte4JAgtaqbepoL9vzr/Do=
7+
github.com/microsoft/typescript-go v0.0.0-20250812073229-cedc0cbe6c18 h1:tnLEMPlvJzwbOXXiXjaVxzYwF7zOpB4Lgh9TAN6YhSs=
8+
github.com/microsoft/typescript-go v0.0.0-20250812073229-cedc0cbe6c18/go.mod h1:EilU3HRKGhtWtFbO/cguqAte4JAgtaqbepoL9vzr/Do=
99
github.com/peter-evans/patience v0.3.0 h1:rX0JdJeepqdQl1Sk9c9uvorjYYzL2TfgLX1adqYm9cA=
1010
github.com/peter-evans/patience v0.3.0/go.mod h1:Kmxu5sY1NmBLFSStvXjX1wS9mIv7wMcP/ubucyMOAu0=
1111
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=

0 commit comments

Comments
 (0)