diff options
| author | Andy Davidoff <disruptek@users.noreply.github.com> | 2020-03-16 10:08:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-16 15:08:38 +0100 |
| commit | 0f672378ab98a5ac0749f069057713aca889d998 (patch) | |
| tree | bb5e0bdbf1211cbf630a8508b670ff1c4357f72a | |
| parent | a102eb5ef653a71e4286312ff9027d37b814a2f6 (diff) | |
| download | Nim-0f672378ab98a5ac0749f069057713aca889d998.tar.gz | |
fix .deprecated. object typedef crash (#13643)
* fix .deprecated. object typedef crash * fixup a test that i don't understand * disable the test rather than debug ci
| -rw-r--r-- | compiler/suggest.nim | 8 | ||||
| -rw-r--r-- | nimsuggest/nimsuggest.nimble | 7 | ||||
| -rw-r--r-- | nimsuggest/tests/ttype_decl.nim | 8 |
3 files changed, 12 insertions, 11 deletions
diff --git a/compiler/suggest.nim b/compiler/suggest.nim index 11717c946..ff58bc92f 100644 --- a/compiler/suggest.nim +++ b/compiler/suggest.nim @@ -497,9 +497,11 @@ proc suggestSym*(conf: ConfigRef; info: TLineInfo; s: PSym; usageSym: var PSym; proc extractPragma(s: PSym): PNode = if s.kind in routineKinds: result = s.ast[pragmasPos] - elif s.kind in {skType, skVar, skLet} and s.ast[0].kind == nkPragmaExpr: - # s.ast = nkTypedef / nkPragmaExpr / [nkSym, nkPragma] - result = s.ast[0][1] + elif s.kind in {skType, skVar, skLet}: + if s.ast != nil and s.ast.len > 0: + if s.ast[0].kind == nkPragmaExpr and s.ast[0].len > 1: + # s.ast = nkTypedef / nkPragmaExpr / [nkSym, nkPragma] + result = s.ast[0][1] doAssert result == nil or result.kind == nkPragma proc warnAboutDeprecated(conf: ConfigRef; info: TLineInfo; s: PSym) = diff --git a/nimsuggest/nimsuggest.nimble b/nimsuggest/nimsuggest.nimble index 3651e12bd..53b5d1d6f 100644 --- a/nimsuggest/nimsuggest.nimble +++ b/nimsuggest/nimsuggest.nimble @@ -1,11 +1,8 @@ -[Package] -name = "nimsuggest" version = "0.1.0" author = "Andreas Rumpf" description = "Tool for providing auto completion data for Nim source code." license = "MIT" -bin = "nimsuggest" +bin = @["nimsuggest"] -[Deps] -Requires: "nim >= 0.11.2, compiler#head" +requires "nim >= 1.1.1" diff --git a/nimsuggest/tests/ttype_decl.nim b/nimsuggest/tests/ttype_decl.nim index e66d39a1c..6d9817ed2 100644 --- a/nimsuggest/tests/ttype_decl.nim +++ b/nimsuggest/tests/ttype_decl.nim @@ -2,14 +2,16 @@ discard """ disabled:true $nimsuggest --tester --maxresults:3 $file >sug $1 -sug;;skType;;ttype_decl.Other;;Other;;$file;;10;;2;;"";;0;;None -sug;;skType;;system.int;;int;;$lib/system.nim;;25;;2;;"";;0;;None -sug;;skType;;system.string;;string;;$lib/system.nim;;48;;2;;"";;0;;None +sug;;skType;;ttype_decl.Other;;Other;;$file;;11;;2;;"";;0;;None +sug;;skType;;system.int;;int;;$lib/system/basic_types.nim;;2;;2;;"";;0;;None +sug;;skType;;system.string;;string;;$lib/system.nim;;34;;2;;"";;0;;None """ import strutils type Other = object ## My other object. Foo = #[!]# + OldOne {.deprecated.} = object + x: int proc main(f: Foo) = |