From da476a872312a4353ed1623c5328be47d1d3b145 Mon Sep 17 00:00:00 2001 From: Timothee Cour Date: Tue, 27 Oct 2020 08:35:10 +0200 Subject: fix #15740 --hint:conf now works more reliably (#15741) --- compiler/nimconf.nim | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'compiler') diff --git a/compiler/nimconf.nim b/compiler/nimconf.nim index 3e8c4d194..05f234ce6 100644 --- a/compiler/nimconf.nim +++ b/compiler/nimconf.nim @@ -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() -- cgit 1.4.1-2-gfad0