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

This commit is contained in:
Timothee Cour
2020-10-27 08:35:10 +02:00
committed by GitHub
parent 25955440df
commit da476a8723

View File

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