- Notifications
You must be signed in to change notification settings - Fork664
Add support for workspace#1238
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
sheetalkamat wants to merge2 commits intomainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Open
Changes from1 commit
Commits
Show all changes
2 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletioninternal/ls/completions_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
37 changes: 35 additions & 2 deletionsinternal/lsp/server.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -141,6 +141,7 @@ type Server struct { | ||
| initializeParams *lsproto.InitializeParams | ||
| positionEncoding lsproto.PositionEncodingKind | ||
| workspace *project.Workspace | ||
| watchEnabled bool | ||
| watcherID atomic.Uint32 | ||
| @@ -471,6 +472,8 @@ func (s *Server) handleRequestOrNotification(ctx context.Context, req *lsproto.R | ||
| return s.handleDidClose(ctx, req) | ||
| case *lsproto.DidChangeWatchedFilesParams: | ||
| return s.handleDidChangeWatchedFiles(ctx, req) | ||
| case *lsproto.DidChangeWorkspaceFoldersParams: | ||
| return s.handleDidChangeWorkspaceFolders(ctx, req) | ||
| case *lsproto.DocumentDiagnosticParams: | ||
| return s.handleDocumentDiagnostic(ctx, req) | ||
| case *lsproto.HoverParams: | ||
| @@ -566,6 +569,14 @@ func (s *Server) handleInitialize(req *lsproto.RequestMessage) { | ||
| FirstTriggerCharacter: "{", | ||
| MoreTriggerCharacter: &[]string{"}", ";", "\n"}, | ||
| }, | ||
| Workspace: &lsproto.WorkspaceOptions{ | ||
| WorkspaceFolders: &lsproto.WorkspaceFoldersServerCapabilities{ | ||
| Supported: ptrTo(true), | ||
| ChangeNotifications: ptrTo(lsproto.StringOrBoolean{ | ||
| Boolean: ptrTo(true), | ||
| }), | ||
| }, | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
| @@ -591,12 +602,20 @@ func (s *Server) handleInitialized(ctx context.Context, req *lsproto.RequestMess | ||
| s.projectService.SetCompilerOptionsForInferredProjects(s.compilerOptionsForInferredProjects) | ||
| } | ||
| if s.initializeParams.RootUri.Value != "" { | ||
| s.projectService.Workspace.SetRoot(ls.DocumentURIToFileName(s.initializeParams.RootUri.Value)) | ||
| } | ||
| if s.initializeParams.WorkspaceFolders != nil { | ||
| for _, folder := range s.initializeParams.WorkspaceFolders.Value { | ||
| s.projectService.Workspace.AddFolder(ls.DocumentURIToFileName(lsproto.DocumentUri(folder.Uri))) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Do you know why we need to handle this kind of thing? Typically this stuff is only ever used if we plan to explicitly handle multi-root workspaces, but I don't think we have a reason to do that, since we're great at just accepting whatever gets opened anyway? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. this was used for creating better inferred projects - thats when projectRootPath was introduced | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
| func (s *Server) handleDidOpen(ctx context.Context, req *lsproto.RequestMessage) error { | ||
| params := req.Params.(*lsproto.DidOpenTextDocumentParams) | ||
| s.projectService.OpenFile(ls.DocumentURIToFileName(params.TextDocument.Uri), params.TextDocument.Text, ls.LanguageKindToScriptKind(params.TextDocument.LanguageId)) | ||
| return nil | ||
| } | ||
| @@ -622,6 +641,19 @@ func (s *Server) handleDidChangeWatchedFiles(ctx context.Context, req *lsproto.R | ||
| return s.projectService.OnWatchedFilesChanged(ctx, params.Changes) | ||
| } | ||
| func (s *Server) handleDidChangeWorkspaceFolders(ctx context.Context, req *lsproto.RequestMessage) error { | ||
| params := req.Params.(*lsproto.DidChangeWorkspaceFoldersParams) | ||
| if params.Event != nil { | ||
| for _, folder := range params.Event.Added { | ||
| s.workspace.AddFolder(ls.DocumentURIToFileName(lsproto.DocumentUri(folder.Uri))) | ||
| } | ||
| for _, folder := range params.Event.Removed { | ||
| s.workspace.RemoveFolder(ls.DocumentURIToFileName(lsproto.DocumentUri(folder.Uri))) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
| func (s *Server) handleDocumentDiagnostic(ctx context.Context, req *lsproto.RequestMessage) error { | ||
| params := req.Params.(*lsproto.DocumentDiagnosticParams) | ||
| project := s.projectService.EnsureDefaultProjectForURI(params.TextDocument.Uri) | ||
| @@ -827,7 +859,8 @@ func isBlockingMethod(method lsproto.Method) bool { | ||
| lsproto.MethodTextDocumentDidChange, | ||
| lsproto.MethodTextDocumentDidSave, | ||
| lsproto.MethodTextDocumentDidClose, | ||
| lsproto.MethodWorkspaceDidChangeWatchedFiles, | ||
| lsproto.MethodWorkspaceDidChangeWorkspaceFolders: | ||
| return true | ||
| } | ||
| return false | ||
44 changes: 22 additions & 22 deletionsinternal/project/ata_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.