diff options
| author | Nikolay Nikolov <nickysn@gmail.com> | 2023-11-15 19:41:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-15 18:41:58 +0100 |
| commit | 3680200df4e0b7a434f5e3c3cee20a228383cd32 (patch) | |
| tree | 683f0d79da505461d7a38dd42cfab8b8c41c7c1e | |
| parent | d0cc02dfc439d14bfadd4e5ac3a7855fe8d8e417 (diff) | |
| download | Nim-3680200df4e0b7a434f5e3c3cee20a228383cd32.tar.gz | |
nimsuggest: Instead of checking for protocol version 3 exactly, check for version 3 or later. (#22945)
Refactored the way nimsuggest checks for protocol version 3. Instead of checking for version 3 exactly, it now checks for version 3 or later. This way, once a version 4 is introduced, it will use version 3 as a base line, and then extra changes to the protocol can be added on top. No functional changes are introduced in this commit.
| -rw-r--r-- | compiler/suggest.nim | 4 | ||||
| -rw-r--r-- | nimsuggest/nimsuggest.nim | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compiler/suggest.nim b/compiler/suggest.nim index 3f9806010..aa8709b16 100644 --- a/compiler/suggest.nim +++ b/compiler/suggest.nim @@ -557,7 +557,7 @@ proc findDefinition(g: ModuleGraph; info: TLineInfo; s: PSym; usageSym: var PSym if s.isNil: return if isTracked(info, g.config.m.trackPos, s.name.s.len) or (s == usageSym and sfForward notin s.flags): suggestResult(g.config, symToSuggest(g, s, isLocal=false, ideDef, info, 100, PrefixMatch.None, false, 0, useSuppliedInfo = s == usageSym)) - if sfForward notin s.flags and g.config.suggestVersion != 3: + if sfForward notin s.flags and g.config.suggestVersion < 3: suggestQuit() else: usageSym = s @@ -761,7 +761,7 @@ proc suggestSentinel*(c: PContext) = when defined(nimsuggest): proc onDef(graph: ModuleGraph, s: PSym, info: TLineInfo) = - if graph.config.suggestVersion == 3 and info.exactEquals(s.info): + if graph.config.suggestVersion >= 3 and info.exactEquals(s.info): suggestSym(graph, info, s, graph.usageSym) template getPContext(): untyped = diff --git a/nimsuggest/nimsuggest.nim b/nimsuggest/nimsuggest.nim index ecfb9875a..b483846ad 100644 --- a/nimsuggest/nimsuggest.nim +++ b/nimsuggest/nimsuggest.nim @@ -219,7 +219,7 @@ proc executeNoHooks(cmd: IdeCmd, file, dirtyfile: AbsoluteFile, line, col: int, graph: ModuleGraph) = let conf = graph.config - if conf.suggestVersion == 3: + if conf.suggestVersion >= 3: let command = fmt "cmd = {cmd} {file}:{line}:{col}" benchmark command: executeNoHooksV3(cmd, file, dirtyfile, line, col, tag, graph) @@ -575,7 +575,7 @@ proc mainThread(graph: ModuleGraph) = else: os.sleep 250 idle += 1 - if idle == 20 and gRefresh and conf.suggestVersion != 3: + if idle == 20 and gRefresh and conf.suggestVersion < 3: # we use some nimsuggest activity to enable a lazy recompile: conf.ideCmd = ideChk conf.writelnHook = proc (s: string) = discard @@ -606,7 +606,7 @@ proc mainCommand(graph: ModuleGraph) = # do not print errors, but log them conf.writelnHook = proc (msg: string) = discard - if graph.config.suggestVersion == 3: + if graph.config.suggestVersion >= 3: graph.config.structuredErrorHook = proc (conf: ConfigRef; info: TLineInfo; msg: string; sev: Severity) = let suggest = Suggest(section: ideChk, filePath: toFullPath(conf, info), line: toLinenumber(info), column: toColumn(info), doc: msg, forth: $sev) |