Refactor file server in Toit LSP. #315
Conversation
| } | ||
| } | ||
|
|
||
| func (cp *CompilerFSProtocol) HandleConn(conn io.ReadWriter) { |
There was a problem hiding this comment.
The code here has just been moved from file_server.go
The only lines changed are at the very top (scanner and w)
| Content []byte | ||
| } | ||
|
|
||
| type CompilerFSProtocol struct { |
There was a problem hiding this comment.
All of these fields were previously part of the FileServer.
| "go.uber.org/zap" | ||
| ) | ||
|
|
||
| type FileSystem interface { |
There was a problem hiding this comment.
Just moved from file_server.go.
| PackageCachePaths() ([]string, error) | ||
| } | ||
|
|
||
| type File struct { |
There was a problem hiding this comment.
Just moved from file_server.go.
| return | ||
| } | ||
|
|
||
| func (cp *CompilerFSProtocol) ServedPackageCachePaths() []string { |
There was a problem hiding this comment.
All these functions were part of the FileServer.
| } | ||
|
|
||
| type File struct { |
There was a problem hiding this comment.
All removed entries here were moved to the protocol.
| Read(path string) (File, error) | ||
| ListDirectory(path string) ([]string, error) | ||
| PackageCachePaths() ([]string, error) | ||
| type FileServer interface { |
There was a problem hiding this comment.
New interface.
Currently there is only one class implementing it (PortFileServer) but I will add a new one soon.
tools/toitlsp/cmd/repro.go
Outdated
| fileServer := compiler.NewFileServer(fs, logger, reproFS.sdkPath) | ||
| go fileServer.ListenAndServe(fmt.Sprintf(":%d", port)) | ||
| fileServer := compiler.NewPortFileServer(fs, logger, reproFS.sdkPath, fmt.Sprintf(":%d", port)) | ||
| go fileServer.Start() |
There was a problem hiding this comment.
I prefer ListenAndServe because it mimics the http server API in go, but if you really want to rename this to Run.
NormallyStart is non-blocking whereasRun is blocking.
There was a problem hiding this comment.
that will make it relatable to os/exec.Cmd
There was a problem hiding this comment.
Sounds good. Thanks.
The reason I'm changing it to Run is because I'm adding another server that only uses a pipe.
No description provided.