fix #10833 type expected error for proc resolution with static[int]]

compiler/semexprs.nim

@@ -1859,6 +1859,10 @@ proc semProcBody(c: PContext, n: PNode; expectedType: PType = nil): PNode =
     else:
       var a = newNodeI(nkAsgn, n.info, 2)
       a[0] = newSymNode(c.p.resultSym)
+      for s in c.p.resultSym.typ.sons.mitems:
+        if s != nil:
+          if s.kind == tyStatic:
+            s = s.base
       a[1] = result
       result = semAsgn(c, a)
   else:

compiler/semtypes.nim

@@ -405,7 +405,7 @@ proc semTypeIdent(c: PContext, n: PNode): PSym =
   if n.kind == nkSym:
     result = getGenSym(c, n.sym)
   else:
-    result = pickSym(c, n, {skType, skGenericParam, skParam})
+    result = pickSym(c, n, {skType, skGenericParam, skParam, skConst})
     if result.isNil:
       result = qualifiedLookUp(c, n, {checkAmbiguity, checkUndeclared})
     if result != nil:
@@ -437,7 +437,7 @@ proc semTypeIdent(c: PContext, n: PNode): PSym =
         else:
           localError(c.config, n.info, errTypeExpected)
           return errorSym(c, n)
-      if result.kind != skType and result.magic notin {mStatic, mType, mTypeOf}:
+      if result.kind notin {skType, skConst} and result.magic notin {mStatic, mType, mTypeOf}:
         # this implements the wanted ``var v: V, x: V`` feature ...
         var ov: TOverloadIter
         var amb = initOverloadIter(ov, c, n)
@@ -448,6 +448,9 @@ proc semTypeIdent(c: PContext, n: PNode): PSym =
           if result.kind != skError: localError(c.config, n.info, errTypeExpected)
           return errorSym(c, n)
       if result.typ.kind != tyGenericParam:
+        if result.kind == skConst:
+          return result
+
         # XXX get rid of this hack!
         var oldInfo = n.info
         when defined(useNodeIds):

tests/generics/t10833.nim

@@ -0,0 +1,14 @@
+type Foo*[A; B; C: static[int]] = object
+  s: string
+
+proc build*[A; B; C: static[int]](s: string;): Foo[A, B, C] =
+    result.s = s
+
+proc build*[A; B; C: static[int]](): Foo[A, B, C] =
+    build[A, B, C]("foo")
+
+type
+    Bar = object
+    Baz = object
+let r = build[Bar, Baz, 1]()
+doAssert r.s == "foo"