Skip to content

Commit

Permalink
refactor(lsp): move indexer to separate file
Browse files Browse the repository at this point in the history
  • Loading branch information
emil14 committed Nov 18, 2023
1 parent 64a7608 commit ea9ce40
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 34 deletions.
44 changes: 44 additions & 0 deletions cmd/lsp/indexer.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package main

import (
"context"
"fmt"

"github.com/nevalang/neva/internal/builder"
"github.com/nevalang/neva/internal/compiler/analyzer"
"github.com/nevalang/neva/internal/compiler/parser"
src "github.com/nevalang/neva/internal/compiler/sourcecode"
)

type Indexer struct {
builder builder.Builder
parser parser.Parser
analyzer analyzer.Analyzer
}

type analyzerMessage string

func (i Indexer) index(ctx context.Context, path string) (src.Module, analyzerMessage, error) {
build, err := i.builder.Build(ctx, path)
if err != nil {
return src.Module{}, "", fmt.Errorf("builder: %w", err)
}

rawMod := build.Modules[build.EntryModule] // TODO use all mods

parsedPkgs, err := i.parser.ParsePackages(ctx, rawMod.Packages)
if err != nil {
return src.Module{}, "", fmt.Errorf("parse prog: %w", err)
}

mod := src.Module{
Manifest: rawMod.Manifest,
Packages: parsedPkgs,
}

if _, err = i.analyzer.Analyze(mod); err != nil { // note that we interpret this error as a message, not failure
return mod, analyzerMessage(err.Error()), nil
}

return mod, "", nil
}
34 changes: 0 additions & 34 deletions cmd/lsp/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package main

import (
"context"
"flag"
"fmt"

Expand Down Expand Up @@ -29,39 +28,6 @@ type Server struct {
problems chan string
}

type Indexer struct {
builder builder.Builder
parser parser.Parser
analyzer analyzer.Analyzer
}

type analyzerMessage string

func (i Indexer) index(ctx context.Context, path string) (src.Module, analyzerMessage, error) {
build, err := i.builder.Build(ctx, path)
if err != nil {
return src.Module{}, "", fmt.Errorf("builder: %w", err)
}

rawMod := build.Modules[build.EntryModule] // TODO use all mods

parsedPkgs, err := i.parser.ParsePackages(ctx, rawMod.Packages)
if err != nil {
return src.Module{}, "", fmt.Errorf("parse prog: %w", err)
}

mod := src.Module{
Manifest: rawMod.Manifest,
Packages: parsedPkgs,
}

if _, err = i.analyzer.Analyze(mod); err != nil { // note that we interpret this error as a message, not failure
return mod, analyzerMessage(err.Error()), nil
}

return mod, "", nil
}

func main() { //nolint:funlen
const serverName = "neva"

Expand Down

0 comments on commit ea9ce40

Please sign in to comment.