jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #15740 --hint:conf now works more reliably (#15741)

Browse source
This commit is contained in:
Timothee Cour 2020-10-27 08:35:10 +02:00 • committed by GitHub
commit da476a8723
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/nimconf.nim
View file

@ -287,16 +287,21 @@ proc loadConfigs*(cfg: RelativeFile; cache: IdentCache; conf: ConfigRef; idgen:
if cfg == DefaultConfig: if cfg == DefaultConfig:
runNimScriptIfExists(pd / DefaultConfigNims) runNimScriptIfExists(pd / DefaultConfigNims)
let scriptFile = conf.projectFull.changeFileExt("nims")
let isMain = scriptFile == conf.projectFull
template showHintConf =
for filename in configFiles: for filename in configFiles:
# delayed to here so that `hintConf` is honored # delayed to here so that `hintConf` is honored
rawMessage(conf, hintConf, filename.string) rawMessage(conf, hintConf, filename.string)
if isMain:
let scriptFile = conf.projectFull.changeFileExt("nims") showHintConf()
configFiles.setLen 0
if conf.command != "nimsuggest": if conf.command != "nimsuggest":
runNimScriptIfExists(scriptFile) runNimScriptIfExists(scriptFile)
else: else:
if scriptFile != conf.projectFull: if not isMain:
runNimScriptIfExists(scriptFile) runNimScriptIfExists(scriptFile)
else: else:
# 'nimsuggest foo.nims' means to just auto-complete the NimScript file # 'nimsuggest foo.nims' means to just auto-complete the NimScript file
discard discard
showHintConf()