Skip to content

Commit 6eebdb5

Browse files
vknabelvknabel
committed
refactor: rename langserver to ls
1 parent 621a763 commit 6eebdb5

8 files changed

+38
-38
lines changed

‎langsrv/handler-initialize.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ func initialize(context *glsp.Context, params *protocol.InitializeParams) (inter
3434
for i, workspace := range params.WorkspaceFolders {
3535
workspaceRoots[i] = workspace.URI
3636
}
37-
langserver.setWorkspaceRoots(workspaceRoots...)
37+
ls.setWorkspaceRoots(workspaceRoots...)
3838
} else if params.RootURI != nil {
39-
langserver.setWorkspaceRoots(*params.RootURI)
39+
ls.setWorkspaceRoots(*params.RootURI)
4040
} else if params.RootPath != nil {
41-
langserver.setWorkspaceRoots(*params.RootPath)
41+
ls.setWorkspaceRoots(*params.RootPath)
4242
}
4343

4444
return protocol.InitializeResult{

‎langsrv/handler-initialized.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import (
1010
)
1111

1212
func initialized(context *glsp.Context, params *protocol.InitializedParams) error {
13-
for _, root := range langserver.workspaceRoots {
13+
for _, root := range ls.workspaceRoots {
1414
matches, err := filepath.Glob(path.Join(strings.TrimPrefix("file://", root), "*/*.lithia"))
1515
if err != nil {
16-
langserver.server.Log.Errorf("package detection failed, due %s", err)
16+
ls.server.Log.Errorf("package detection failed, due %s", err)
1717
continue
1818
}
1919
for _, match := range matches {
20-
mod := langserver.resolver.ResolvePackageAndModuleForReferenceFile(match)
20+
mod := ls.resolver.ResolvePackageAndModuleForReferenceFile(match)
2121
openModuleTextDocumentsIfNeeded(context, mod)
2222
}
2323
}

‎langsrv/handler-text-document-did-change.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
)
88

99
func textDocumentDidChange(context *glsp.Context, params *protocol.DidChangeTextDocumentParams) error {
10-
mod := langserver.resolver.ResolvePackageAndModuleForReferenceFile(params.TextDocument.URI)
11-
entry := langserver.documentCache.documents[params.TextDocument.URI]
10+
mod := ls.resolver.ResolvePackageAndModuleForReferenceFile(params.TextDocument.URI)
11+
entry := ls.documentCache.documents[params.TextDocument.URI]
1212
text := entry.item.Text
1313
for _, event := range params.ContentChanges {
1414
switch e := event.(type) {
@@ -24,8 +24,8 @@ func textDocumentDidChange(context *glsp.Context, params *protocol.DidChangeText
2424
syntaxErrs = append(syntaxErrs, errs...)
2525
sourceFile, errs := fileParser.ParseSourceFile()
2626
syntaxErrs = append(syntaxErrs, errs...)
27-
langserver.documentCache.documents[params.TextDocument.URI].fileParser = fileParser
28-
langserver.documentCache.documents[params.TextDocument.URI].sourceFile = sourceFile
27+
ls.documentCache.documents[params.TextDocument.URI].fileParser = fileParser
28+
ls.documentCache.documents[params.TextDocument.URI].sourceFile = sourceFile
2929

3030
analyzeErrs := analyzeErrorsForSourceFile(context, mod, *sourceFile)
3131
publishSyntaxErrorDiagnostics(context, params.TextDocument.URI, uint32(params.TextDocument.Version), syntaxErrs, analyzeErrs)

‎langsrv/handler-text-document-did-open.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import (
1313

1414
func textDocumentDidOpen(context *glsp.Context, params *protocol.DidOpenTextDocumentParams) error {
1515
lithiaParser := parser.NewParser()
16-
mod := langserver.resolver.ResolvePackageAndModuleForReferenceFile(params.TextDocument.URI)
16+
mod := ls.resolver.ResolvePackageAndModuleForReferenceFile(params.TextDocument.URI)
1717
openModuleTextDocumentsIfNeeded(context, mod)
1818

1919
syntaxErrs := make([]parser.SyntaxError, 0)
2020
fileParser, errs := lithiaParser.Parse(mod.AbsoluteModuleName(), string(params.TextDocument.URI), params.TextDocument.Text)
2121
syntaxErrs = append(syntaxErrs, errs...)
2222
sourceFile, errs := fileParser.ParseSourceFile()
2323
syntaxErrs = append(syntaxErrs, errs...)
24-
langserver.documentCache.documents[params.TextDocument.URI] = &textDocumentEntry{
24+
ls.documentCache.documents[params.TextDocument.URI] = &textDocumentEntry{
2525
item: params.TextDocument,
2626
parser: lithiaParser,
2727
fileParser: fileParser,
@@ -41,15 +41,15 @@ func openModuleTextDocumentsIfNeeded(context *glsp.Context, mod resolution.Resol
4141
}
4242
for _, filePath := range fileNames {
4343
fileUri := "file://" + filePath
44-
if langserver.documentCache.documents[fileUri] != nil {
44+
if ls.documentCache.documents[fileUri] != nil {
4545
continue
4646
}
4747
lithiaParser := parser.NewParser()
4848

4949
syntaxErrs := make([]parser.SyntaxError, 0)
5050
bytes, err := os.ReadFile(filePath)
5151
if err != nil {
52-
langserver.server.Log.Errorf("failed to read %s, due %s", fileUri, err.Error())
52+
ls.server.Log.Errorf("failed to read %s, due %s", fileUri, err.Error())
5353
continue
5454
}
5555
contents := string(bytes)
@@ -58,7 +58,7 @@ func openModuleTextDocumentsIfNeeded(context *glsp.Context, mod resolution.Resol
5858
sourceFile, errs := fileParser.ParseSourceFile()
5959
syntaxErrs = append(syntaxErrs, errs...)
6060

61-
langserver.documentCache.documents[fileUri] = &textDocumentEntry{
61+
ls.documentCache.documents[fileUri] = &textDocumentEntry{
6262
parser: lithiaParser,
6363
fileParser: fileParser,
6464
sourceFile: sourceFile,
@@ -77,7 +77,7 @@ func analyzeErrorsForSourceFile(context *glsp.Context, mod resolution.ResolvedMo
7777
continue
7878
}
7979
importDecl := decl.(ast.DeclImport)
80-
resolvedModule, err := langserver.resolver.ResolveModuleFromPackage(mod.Package(), importDecl.ModuleName)
80+
resolvedModule, err := ls.resolver.ResolveModuleFromPackage(mod.Package(), importDecl.ModuleName)
8181
if err != nil {
8282
analyzeErrs = append(
8383
analyzeErrs,

‎langsrv/handler-text-document-semantic-tokens-full.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
func textDocumentSemanticTokensFull(context *glsp.Context, params *protocol.SemanticTokensParams) (*protocol.SemanticTokens, error) {
13-
entry := langserver.documentCache.documents[params.TextDocument.URI]
13+
entry := ls.documentCache.documents[params.TextDocument.URI]
1414
if entry == nil {
1515
return nil, nil
1616
}

‎langsrv/handler-workspace-did-delete-files.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func workspaceDidDeleteFiles(context *glsp.Context, params *protocol.DeleteFiles
1212
Version: nil,
1313
Diagnostics: []protocol.Diagnostic{},
1414
})
15-
delete(langserver.documentCache.documents, deleted.URI)
15+
delete(ls.documentCache.documents, deleted.URI)
1616
}
1717
return nil
1818
}

‎langsrv/lang-server.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type lithiaLangserver struct {
2323
workspaceRoots []string
2424
}
2525

26-
var langserver lithiaLangserver = lithiaLangserver{
26+
var ls lithiaLangserver = lithiaLangserver{
2727
resolver: resolution.DefaultModuleResolver(),
2828
documentCache: &documentCache{documents: make(map[protocol.URI]*textDocumentEntry)},
2929
workspaceRoots: []string{},
@@ -55,23 +55,23 @@ func init() {
5555
}
5656

5757
func RunStdio() error {
58-
langserver.server = server.NewServer(&handler, lsName, debug)
59-
return langserver.server.RunStdio()
58+
ls.server = server.NewServer(&handler, lsName, debug)
59+
return ls.server.RunStdio()
6060
}
6161

6262
func RunIPC() error {
63-
langserver.server = server.NewServer(&handler, lsName, debug)
64-
return langserver.server.RunNodeJs()
63+
ls.server = server.NewServer(&handler, lsName, debug)
64+
return ls.server.RunNodeJs()
6565
}
6666

6767
func RunSocket(address string) error {
68-
langserver.server = server.NewServer(&handler, lsName, debug)
69-
return langserver.server.RunWebSocket(address)
68+
ls.server = server.NewServer(&handler, lsName, debug)
69+
return ls.server.RunWebSocket(address)
7070
}
7171

7272
func RunTCP(address string) error {
73-
langserver.server = server.NewServer(&handler, lsName, debug)
74-
return langserver.server.RunTCP(address)
73+
ls.server = server.NewServer(&handler, lsName, debug)
74+
return ls.server.RunTCP(address)
7575
}
7676

7777
func (ls *lithiaLangserver) setWorkspaceRoots(roots ...string) {

‎langsrv/req-context.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ type ReqContext struct {
1717
func NewReqContext(textDocument protocol.TextDocumentIdentifier) *ReqContext {
1818
return &ReqContext{
1919
textDocument: textDocument,
20-
textDocumentEntry: *langserver.documentCache.documents[textDocument.URI],
20+
textDocumentEntry: *ls.documentCache.documents[textDocument.URI],
2121
}
2222
}
2323

2424
func NewReqContextAtPosition(position *protocol.TextDocumentPositionParams) *ReqContext {
2525
return &ReqContext{
2626
textDocument: position.TextDocument,
2727
position: position.Position,
28-
textDocumentEntry: *langserver.documentCache.documents[position.TextDocument.URI],
28+
textDocumentEntry: *ls.documentCache.documents[position.TextDocument.URI],
2929
}
3030
}
3131

@@ -77,7 +77,7 @@ func (rc *ReqContext) moduleDeclarations() []ast.Decl {
7777
if rc.item.URI == fileUrl {
7878
continue
7979
}
80-
docEntry := langserver.documentCache.documents[fileUrl]
80+
docEntry := ls.documentCache.documents[fileUrl]
8181
if docEntry == nil || docEntry.sourceFile == nil {
8282
continue
8383
}
@@ -100,19 +100,19 @@ func (rc *ReqContext) importedDeclarations(context *glsp.Context) []importedDecl
100100

101101
globals := make([]importedDecl, 0)
102102

103-
resolvedPrelude, err := langserver.resolver.ResolveModuleFromPackage(rc.textDocumentEntry.module.Package(), "prelude")
103+
resolvedPrelude, err := ls.resolver.ResolveModuleFromPackage(rc.textDocumentEntry.module.Package(), "prelude")
104104
if err != nil {
105-
langserver.server.Log.Error(err.Error())
105+
ls.server.Log.Error(err.Error())
106106
} else {
107107
openModuleTextDocumentsIfNeeded(context, resolvedPrelude)
108108
}
109109

110110
for _, sameModuleFile := range resolvedPrelude.Files {
111111
fileUri := "file://" + sameModuleFile
112-
if langserver.documentCache.documents[fileUri] == nil {
112+
if ls.documentCache.documents[fileUri] == nil {
113113
continue
114114
}
115-
entry := langserver.documentCache.documents[fileUri]
115+
entry := ls.documentCache.documents[fileUri]
116116
if entry.sourceFile == nil {
117117
continue
118118
}
@@ -126,19 +126,19 @@ func (rc *ReqContext) importedDeclarations(context *glsp.Context) []importedDecl
126126
continue
127127
}
128128
importDecl := decl.(ast.DeclImport)
129-
resolvedModule, err := langserver.resolver.ResolveModuleFromPackage(rc.textDocumentEntry.module.Package(), importDecl.ModuleName)
129+
resolvedModule, err := ls.resolver.ResolveModuleFromPackage(rc.textDocumentEntry.module.Package(), importDecl.ModuleName)
130130
if err != nil {
131-
langserver.server.Log.Error(err.Error())
131+
ls.server.Log.Error(err.Error())
132132
} else {
133133
openModuleTextDocumentsIfNeeded(context, resolvedModule)
134134
}
135135

136136
for _, sameModuleFile := range resolvedModule.Files {
137137
fileUri := "file://" + sameModuleFile
138-
if langserver.documentCache.documents[fileUri] == nil {
138+
if ls.documentCache.documents[fileUri] == nil {
139139
continue
140140
}
141-
entry := langserver.documentCache.documents[fileUri]
141+
entry := ls.documentCache.documents[fileUri]
142142
if entry.sourceFile == nil {
143143
continue
144144
}

0 commit comments

Comments
 (0)