nimsuggest: filenames in quotes now work; general hints are not emitted

This commit is contained in:
Araq
2015-01-29 01:09:27 +01:00
parent 3ac2e00334
commit ebda8e89e1
2 changed files with 6 additions and 5 deletions

View File

@@ -739,6 +739,9 @@ proc writeContext(lastinfo: TLineInfo) =
getMessageStr(errInstantiationFrom, "")])
info = msgContext[i]
proc ignoreMsgBecauseOfIdeTools(msg: TMsgKind): bool =
msg >= errGenerated and gCmd == cmdIdeTools and optIdeDebug notin gGlobalOptions
proc rawMessage*(msg: TMsgKind, args: openArray[string]) =
var frmt: string
case msg
@@ -757,7 +760,8 @@ proc rawMessage*(msg: TMsgKind, args: openArray[string]) =
frmt = RawHintFormat
inc(gHintCounter)
let s = `%`(frmt, `%`(msgKindToString(msg), args))
msgWriteln(s)
if not ignoreMsgBecauseOfIdeTools(msg):
msgWriteln(s)
handleError(msg, doAbort, s)
proc rawMessage*(msg: TMsgKind, arg: string) =
@@ -776,9 +780,6 @@ proc formatMsg*(info: TLineInfo, msg: TMsgKind, arg: string): string =
result = frmt % [toMsgFilename(info), coordToStr(info.line),
coordToStr(info.col), getMessageStr(msg, arg)]
proc ignoreMsgBecauseOfIdeTools(msg: TMsgKind): bool =
msg >= errGenerated and gCmd == cmdIdeTools and optIdeDebug notin gGlobalOptions
proc liMessage(info: TLineInfo, msg: TMsgKind, arg: string,
eh: TErrorHandling) =
var frmt: string

View File

@@ -46,7 +46,7 @@ proc parseQuoted(cmd: string; outp: var string; start: int): int =
var i = start
i += skipWhitespace(cmd, i)
if cmd[i] == '"':
i += parseUntil(cmd, outp, '"', i+1)+1
i += parseUntil(cmd, outp, '"', i+1)+2
else:
i += parseUntil(cmd, outp, seps, i)
result = i