[Go] misc tweaks from code review

Co-authored-by: deathaxe <deathaxe@web.de>

Go/Go.sublime-syntax

@@ -471,8 +471,7 @@ contexts:
 
   pop-type-assertion:
     - include: pop-on-paren-end
-    - match: (?=\S)
-      push: pop-type
+    - include: match-type
 
   match-parens:
     - match: \(
@@ -989,8 +988,7 @@ contexts:
     - include: pop-before-terminator
     - match: (?=\()
       set: pop-func-parameter-list
-    - match: (?=\S)
-      set: pop-type
+    - include: pop-type
 
   # https://golang.org/ref/spec#Function_types
   #
@@ -1063,8 +1061,7 @@ contexts:
     - include: match-comma
     - include: match-ellipsis
     - include: match-keywords
-    - match: (?=\S)
-      push: pop-type
+    - include: match-type
 
   # At the time of writing, this is the only part of Go that uses "untyped"
   # syntax for parameters, similar to function definitions in dynamic languages
@@ -1173,7 +1170,7 @@ contexts:
 
   match-type:
     - match: (?=\S)
-      push: pop-type
+      push: [pop-after-type, pop-type-single]
 
   pop-type:
     - match: (?=\S)