contract + functions

Author: nathanielCherian

client/src/CashscriptHoverProvider.ts

@@ -38,7 +38,7 @@ class CashscriptHoverProvider implements vscode.HoverProvider{
 
 	getMiscellaneousHovers(document:vscode.TextDocument, position:vscode.Position):vscode.MarkdownString[]{
 
-		const reg = /(contract|function) (\w+)/;
+		const reg = /(contract|function)\s+(\w+)\s*\(.*\)/;
 		let range = document.getWordRangeAtPosition(position, reg);
 		let word = document.getText(range);
 		if(word.includes("\n")) return null;

client/testFixture/p.cash

@@ -1,9 +1,13 @@
-pragma cashscript ^0.5.6;
+pragma cashscript ^0.6.0;
 
 contract MyContract() {
 
     function myFunction(int num) {
-        
+        require(num == 1);
+    }
+
+    function spend(bool b) {
+        require(b == true);
     }
 
 }

client/testFixture/p.json

@@ -0,0 +1,33 @@
+{
+  "contractName": "MyContract",
+  "constructorInputs": [],
+  "abi": [
+    {
+      "name": "myFunction",
+      "covenant": false,
+      "inputs": [
+        {
+          "name": "num",
+          "type": "int"
+        }
+      ]
+    },
+    {
+      "name": "spend",
+      "covenant": false,
+      "inputs": [
+        {
+          "name": "b",
+          "type": "bool"
+        }
+      ]
+    }
+  ],
+  "bytecode": "OP_DUP OP_0 OP_NUMEQUAL OP_IF OP_SWAP OP_1 OP_NUMEQUAL OP_NIP OP_ELSE OP_1 OP_NUMEQUALVERIFY OP_1 OP_EQUAL OP_ENDIF",
+  "source": "pragma cashscript ^0.6.0;\r\n\r\ncontract MyContract() {\r\n    \r\n    function myFunction(int num) {\r\n        require(num == 1);\r\n    }\r\n\r\n    function spend(bool b) {\r\n        require(b == true);\r\n    }\r\n\r\n}",
+  "compiler": {
+    "name": "cashc",
+    "version": "0.6.0"
+  },
+  "updatedAt": "2021-04-28T15:57:05.356Z"
+}

server/src/completionService.ts

@@ -11,6 +11,8 @@ export default class CompletionService {
 		this.offset = doc?.offsetAt(pos) || 0;
 	}
 
+
+
 	getAllCompletions(): CompletionItem[]{
 		console.log("completion TRIGG")
 		let completions:CompletionItem[] = [];