nimsuggest: make tests green again

compiler/ast.nim

@@ -736,7 +736,7 @@ type
 
   TLibKind* = enum
     libHeader, libDynamic
-    
+
   TLib* = object              # also misused for headers!
     kind*: TLibKind
     generated*: bool          # needed for the backends:
@@ -744,7 +744,7 @@ type
     name*: Rope
     path*: PNode              # can be a string literal!
 
-    
+
   CompilesId* = int ## id that is used for the caching logic within
                     ## ``system.compiles``. See the seminst module.
   TInstantiation* = object

compiler/parser.nim

@@ -2002,12 +2002,12 @@ proc parseStmt(p: var TParser): PNode =
           break
         p.hasProgress = false
         var a = complexOrSimpleStmt(p)
-        if not p.hasProgress and p.tok.tokType == tkEof: break
-        if a.kind != nkEmpty and p.hasProgress:
+        if a.kind != nkEmpty:
           addSon(result, a)
         else:
           parMessage(p, errExprExpected, p.tok)
           getTok(p)
+        if not p.hasProgress and p.tok.tokType == tkEof: break
   else:
     # the case statement is only needed for better error messages:
     case p.tok.tokType

nimsuggest/nimsuggest.nim

@@ -424,7 +424,7 @@ proc execCmd(cmd: string; graph: ModuleGraph; cache: IdentCache; cachedMsgs: Cac
   else:
     if gIdeCmd == ideChk:
       for cm in cachedMsgs: errorHook(cm.info, cm.msg, cm.sev)
-    execute(gIdeCmd, orig, dirtyfile, line, col-1, graph, cache)
+    execute(gIdeCmd, orig, dirtyfile, line, col, graph, cache)
   sentinel()
 
 proc recompileFullProject(graph: ModuleGraph; cache: IdentCache) =