Skip to content

Use nimble getnimdir instead of parsing nimDir from dump output #417

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bung87 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use nimble getnimdir instead of parsing nimDir from dump output #417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions ls.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,6 @@ type
NimbleDumpInfo* = object
srcDir*: string
name*: string
nimDir*: Option[string]
nimblePath*: Option[string]
entryPoints*: seq[string] #when it's empty, means the nimble version doesnt dump it.

Expand Down Expand Up @@ -290,8 +289,6 @@ proc getNimbleDumpInfo*(
result.srcDir = line[(1 + line.find '"') ..^ 2]
if line.startsWith("name"):
result.name = line[(1 + line.find '"') ..^ 2]
if line.startsWith("nimDir"):
result.nimDir = some line[(1 + line.find '"') ..^ 2]
if line.startsWith("nimblePath"):
result.nimblePath = some line[(1 + line.find '"') ..^ 2]
if line.startsWith("entryPoints"):
Expand Down Expand Up @@ -499,12 +496,33 @@ proc getNimVersion(nimDir: string): string =
if line.startsWith(NimCompilerVersion):
return line

proc getNimbleNimDir*(
ls: LanguageServer, nimbleFile: string
): Future[Option[string]] {.async.} =
var process: AsyncProcessRef
try:
process = await startProcess(
"nimble",
arguments = @["getnimdir", nimbleFile],
options = {UsePath},
stderrHandle = AsyncProcess.Pipe,
stdoutHandle = AsyncProcess.Pipe,
)
let info = string.fromBytes(process.stdoutStream.read().await)
let line = info.strip
if line.len > 0 and line.dirExists:
result = some line
except OSError, IOError:
debug "Failed to get nimble nimdir", nimbleFile = nimbleFile
finally:
await shutdownChildProcess(process)

proc getNimSuggestPathAndVersion(
ls: LanguageServer, conf: NlsConfig, workingDir: string
): Future[(string, string)] {.async.} =
#Attempting to see if the project is using a custom Nim version, if it's the case this will be slower than usual
let nimbleDumpInfo = await ls.getNimbleDumpInfo("")
let nimDir = nimbleDumpInfo.nimDir.get ""
let nimDirOpt = await ls.getNimbleNimDir("")
let nimDir = nimDirOpt.get ""

var nimsuggestPath = expandTilde(conf.nimsuggestPath.get(""))
var nimVersion = ""
Expand Down