From a5701d6b71853e683f4d655b6b5ea4a13bec993b Mon Sep 17 00:00:00 2001 From: Andreas Rumpf Date: Tue, 29 May 2018 08:22:09 +0200 Subject: [PATCH] ensure compiler API doesn't import the RST engine --- compiler/sigmatch.nim | 2 +- compiler/suggest.nim | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/sigmatch.nim b/compiler/sigmatch.nim index 0b51cafdcf..ab5ac7b455 100644 --- a/compiler/sigmatch.nim +++ b/compiler/sigmatch.nim @@ -15,7 +15,7 @@ import magicsys, condsyms, idents, lexer, options, parampatterns, strutils, trees, nimfix / pretty, lineinfos -when not defined(noDocgen): +when defined(booting) or defined(nimsuggest): import docgen type diff --git a/compiler/suggest.nim b/compiler/suggest.nim index 391906c3f0..b66dbce689 100644 --- a/compiler/suggest.nim +++ b/compiler/suggest.nim @@ -115,7 +115,7 @@ proc symToSuggest(conf: ConfigRef; s: PSym, isLocal: bool, section: IdeCmd, info result.forth = typeToString(s.typ) else: result.forth = "" - when not defined(noDocgen): + when defined(nimsuggest) and not defined(noDocgen): result.doc = s.extractDocComment let infox = if section in {ideUse, ideHighlight, ideOutline}: info else: s.info result.filePath = toFullPath(conf, infox) @@ -153,7 +153,7 @@ proc `$`*(suggest: Suggest): string = result.add(sep) result.add($suggest.column) result.add(sep) - when not defined(noDocgen): + when defined(nimsuggest) and not defined(noDocgen): result.add(suggest.doc.escape) if suggest.version == 0: result.add(sep)