luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2167 from alixander/no-fs

Browse source 
no need to pass fs
This commit is contained in:
Alexander Wang 2024-10-17 09:05:38 -06:00 committed by GitHub
commit 4fd0af8edc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
d2lsp/d2lsp.go
View file

@ -60,11 +60,8 @@ func GetRefs(path string, fs map[string]string, boardPath []string, key string)
return refs, nil return refs, nil
} }
func GetImportRanges(path string, fs map[string]string, importPath string) (ranges []d2ast.Range, _ error) { func GetImportRanges(path, file string, importPath string) (ranges []d2ast.Range, _ error) {
if _, ok := fs[path]; !ok { r := strings.NewReader(file)
return nil, fmt.Errorf(`"%s" not found`, path)
}
r := strings.NewReader(fs[path])
ast, err := d2parser.Parse(path, r, nil) ast, err := d2parser.Parse(path, r, nil)
if err != nil { if err != nil {
return nil, err return nil, err

4
d2lsp/d2lsp_test.go
View file

@ -136,12 +136,12 @@ okay
des des
`, `,
} }
ranges, err := d2lsp.GetImportRanges("yes/index.d2", fs, "fast/ok.d2") ranges, err := d2lsp.GetImportRanges("yes/index.d2", fs["yes/index.d2"], "fast/ok.d2")
assert.Success(t, err) assert.Success(t, err)
assert.Equal(t, 1, len(ranges)) assert.Equal(t, 1, len(ranges))
assert.Equal(t, 1, ranges[0].Start.Line) assert.Equal(t, 1, ranges[0].Start.Line)
ranges, err = d2lsp.GetImportRanges("yes/index.d2", fs, "yes/pok.d2") ranges, err = d2lsp.GetImportRanges("yes/index.d2", fs["yes/index.d2"], "yes/pok.d2")
assert.Success(t, err) assert.Success(t, err)
assert.Equal(t, 1, len(ranges)) assert.Equal(t, 1, len(ranges))
assert.Equal(t, 4, ranges[0].Start.Line) assert.Equal(t, 4, ranges[0].Start.Line)