Skip to content

Commit

Permalink
followup nim-lang#16067 --spellSuggest (nim-lang#17401)
Browse files Browse the repository at this point in the history
* followup nim-lang#16067 --spellSuggest

* enable --spellSuggest by default

* fixup
  • Loading branch information
timotheecour authored and ringabout committed Mar 22, 2021
1 parent 96fd600 commit 31acbdd
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 23 deletions.
1 change: 1 addition & 0 deletions compiler/condsyms.nim
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,4 @@ proc initDefines*(symbols: StringTableRef) =
defineSymbol("nimHasJsBigIntBackend")
defineSymbol("nimHasWarningAsError")
defineSymbol("nimHasHintAsError")
defineSymbol("nimHasSpellSuggest")
8 changes: 5 additions & 3 deletions compiler/lookups.nim
Original file line number Diff line number Diff line change
Expand Up @@ -382,10 +382,12 @@ template toOrderTup(a: SpellCandidate): auto =
proc `<`(a, b: SpellCandidate): bool =
a.toOrderTup < b.toOrderTup

proc mustFixSpelling(c: PContext): bool {.inline.} =
result = c.config.spellSuggestMax != 0 and c.compilesContextId == 0
# don't slowdown inside compiles()

proc fixSpelling(c: PContext, n: PNode, ident: PIdent, result: var string) =
## when we cannot find the identifier, suggest nearby spellings
if c.config.spellSuggestMax == 0: return
if c.compilesContextId > 0: return # don't slowdown inside compiles()
var list = initHeapQueue[SpellCandidate]()
let name0 = ident.s.nimIdentNormalize

Expand Down Expand Up @@ -458,7 +460,7 @@ proc errorUndeclaredIdentifier*(c: PContext; info: TLineInfo; name: string, extr

proc errorUndeclaredIdentifierHint*(c: PContext; n: PNode, ident: PIdent): PSym =
var extra = ""
fixSpelling(c, n, ident, extra)
if c.mustFixSpelling: fixSpelling(c, n, ident, extra)
errorUndeclaredIdentifier(c, n.info, ident.s, extra)
result = errorSym(c, n)

Expand Down
38 changes: 18 additions & 20 deletions compiler/options.nim
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,23 @@ type # please make sure we have under 32 options
TGlobalOptions* = set[TGlobalOption]

const
harmlessOptions* = {optForceFullMake, optNoLinking, optRun,
optUseColors, optStdout}
harmlessOptions* = {optForceFullMake, optNoLinking, optRun, optUseColors, optStdout}
genSubDir* = RelativeDir"nimcache"
NimExt* = "nim"
RodExt* = "rod"
HtmlExt* = "html"
JsonExt* = "json"
TagsExt* = "tags"
TexExt* = "tex"
IniExt* = "ini"
DefaultConfig* = RelativeFile"nim.cfg"
DefaultConfigNims* = RelativeFile"config.nims"
DocConfig* = RelativeFile"nimdoc.cfg"
DocTexConfig* = RelativeFile"nimdoc.tex.cfg"
htmldocsDir* = htmldocsDirname.RelativeDir
docRootDefault* = "@default" # using `@` instead of `$` to avoid shell quoting complications
oKeepVariableNames* = true
spellSuggestSecretSauce* = -1

type
TBackend* = enum
Expand Down Expand Up @@ -483,6 +498,7 @@ proc newConfigRef*(): ConfigRef =
suggestMaxResults: 10_000,
maxLoopIterationsVM: 10_000_000,
vmProfileData: newProfileData(),
spellSuggestMax: spellSuggestSecretSauce,
)
setTargetFromSystem(result.target)
# enable colors by default on terminals
Expand Down Expand Up @@ -560,24 +576,6 @@ template compilationCachePresent*(conf: ConfigRef): untyped =
template optPreserveOrigSource*(conf: ConfigRef): untyped =
optEmbedOrigSrc in conf.globalOptions

const
genSubDir* = RelativeDir"nimcache"
NimExt* = "nim"
RodExt* = "rod"
HtmlExt* = "html"
JsonExt* = "json"
TagsExt* = "tags"
TexExt* = "tex"
IniExt* = "ini"
DefaultConfig* = RelativeFile"nim.cfg"
DefaultConfigNims* = RelativeFile"config.nims"
DocConfig* = RelativeFile"nimdoc.cfg"
DocTexConfig* = RelativeFile"nimdoc.tex.cfg"
htmldocsDir* = htmldocsDirname.RelativeDir
docRootDefault* = "@default" # using `@` instead of `$` to avoid shell quoting complications
oKeepVariableNames* = true
spellSuggestSecretSauce* = -1

proc mainCommandArg*(conf: ConfigRef): string =
## This is intended for commands like check or parse
## which will work on the main project file unless
Expand Down
1 change: 1 addition & 0 deletions tests/config.nims
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ switch("path", "$lib/../testament/lib")
switch("colors", "off")
switch("listFullPaths", "off")
switch("excessiveStackTrace", "off")
switch("spellSuggest", "0")

# for std/unittest
switch("define", "nimUnittestOutputLevel:PRINT_FAILURES")
Expand Down

0 comments on commit 31acbdd

Please sign in to comment.