Fixes to hover support

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

src/language/providers/hoverProvider.ts

@@ -87,16 +87,29 @@ export const hoverProvider = languages.registerHoverProvider({ language: `sql` }
 
           if (result) {
             if ('routine' in result) {
-              const routineOffset = ref.tokens[ref.tokens.length-1].range.end-1;
-              const callableRef = statementAt.getCallableDetail(routineOffset, false);
-              if (callableRef) {
-                const { currentCount } = getPositionData(callableRef, routineOffset);
-                const signatures = await DbCache.getCachedSignatures(callableRef.parentRef.object.schema, callableRef.parentRef.object.name);
-                const possibleSignatures = signatures.filter((s) => s.parms.length >= currentCount).sort((a, b) => a.parms.length - b.parms.length);
-                const signature = possibleSignatures.find((signature) => currentCount <= signature.parms.length);
-                if (signature) {
-                  addRoutineMd(md, signature, result);
-                }
+              let signatures: CallableSignature[];
+              let signature: CallableSignature | undefined;
+
+              const lastToken = ref.tokens[ref.tokens.length-1];
+
+              if (lastToken.type === `closebracket`) {
+                let routineOffset: number = lastToken.range.start-1;
+                const callableRef = statementAt.getCallableDetail(routineOffset, false);
+                if (callableRef) {
+                  const { currentCount } = getPositionData(callableRef, routineOffset);
+                  signatures = await DbCache.getCachedSignatures(callableRef.parentRef.object.schema, callableRef.parentRef.object.name);
+                  const possibleSignatures = signatures.filter((s) => s.parms.length >= currentCount).sort((a, b) => a.parms.length - b.parms.length);
+                  signature = possibleSignatures.find((signature) => currentCount <= signature.parms.length);
+                } 
+              }
+              
+              if (!signature) {
+                signatures = await DbCache.getCachedSignatures(result.routine.schema, result.routine.name);
+                signature = signatures[0];
+              }
+
+              if (signature) {
+                addRoutineMd(md, signature, result);
               }
             } else {
               addSymbol(md, result);

src/language/sql/statement.ts

@@ -378,7 +378,7 @@ export default class Statement {
 		switch (this.type) {
 			case StatementType.Call:
 				// CALL X()
-				doAdd(this.getRefAtToken(1));
+				doAdd(this.getRefAtToken(1, {includeParameters: true}));
 				break;
 
 			case StatementType.Alter:
@@ -615,6 +615,18 @@ export default class Statement {
 
 			if (!isSubSelect && !sqlObj.isUDTF) {
 				sqlObj.tokens = this.tokens.slice(i, endIndex+1);
+
+				if (options.includeParameters && tokenIs(this.tokens[endIndex+1], `openbracket`)) {
+					const blockTokens = this.getBlockAt(this.tokens[endIndex+1].range.end+1);
+
+					if (blockTokens.length > 0) {
+						sqlObj.tokens = sqlObj.tokens.concat([
+							{type: `openbracket`, value: `(`, range: {start: this.tokens[endIndex+1].range.start, end: this.tokens[endIndex+1].range.end}},
+							...blockTokens,
+							{type: `closebracket`, value: `)`, range: {start: blockTokens[blockTokens.length-1].range.end, end: blockTokens[blockTokens.length-1].range.end}}
+						]);
+					}
+				}
 			}
 
 			if (options.withSystemName) {