variable completions

Author: nathanielCherian

client/src/CashscriptSignatureCompleter.ts

@@ -15,8 +15,6 @@ class CashscriptSignatureCompleter implements vscode.SignatureHelpProvider{
 		const sh = new vscode.SignatureHelp();
 		const data = LANGUAGE[word] || TYPECASTS[word];
 		sh.signatures = [new vscode.SignatureInformation(data.codeDesc, new vscode.MarkdownString().appendCodeblock(data.code))];
-		//sh.signatures = this.SIG_DATA[word]; data
-		//sh.signatures = [new vscode.SignatureInformation("param here", "documentation here")]
 		return sh;	
 	}
 

client/src/LanguageDesc.ts

@@ -86,7 +86,24 @@ let TYPECASTS:Data = {
 	int:{
 		code:"int int( v )",
 		codeDesc:"Converts to int"
+	},
+	string:{
+		code:"string string( v )",
+		codeDesc:"Converts to string"
+	},
+	bytes:{
+		code:"bytes bytes( v )",
+		codeDesc:"Converts to bytes"
+	},
+	bool:{
+		code:"bool bool( v )",
+		codeDesc:"Converts to bool"
+	},
+	date:{
+		code:"int date(\" YYYY-MM-DDThh:mm:ss \")",
+		codeDesc:"Converts implicit date to timestamp"
 	}
+
 }
 
 let LANGUAGE:Data = {...GLOBAL_FUNCTIONS, ...OUTPUT_INSTANTIATION, ...STATEMENTS};

client/testFixture/time.cash

@@ -6,9 +6,10 @@ contract Mecenas(bytes4 initialBlock, int pledgePerBlock, bytes20 recipient, byt
     function receive(pubkey pk, sig s, int pledge) {
         require(checkSig(s, pk));
 
+        int m = date("");
         int initial = int(initialBlock);
         require(tx.time >= initial);
-
+        
         // Pledge amount calculation is done in client, verified in contract
         // When OP_MUL is enabled this can be done in contract
         // Double require to account for integer division

server/src/completionService.ts

@@ -23,6 +23,7 @@ export default class CompletionService {
 			return this.getDotCompletions();
 		}
 
+		completions = completions.concat(this.getVarCompletions());
 		completions = completions.concat(this.getConditionalCompletions());
 		completions = completions.concat(this.getControlCompletions());
 		completions = completions.concat(this.getGlobalFunctionCompletions());
@@ -114,10 +115,23 @@ export default class CompletionService {
 			return this.DOT_COMPLETIONS[keyword];
 		}
 
-
 		return []
 	}
-	
+
+	protected getVarCompletions():CompletionItem[]{
+
+		const re = /(int|bool|string|pubkey|sig|datasig|bytes)\s+(\w+)/g;
+		const completions:CompletionItem[] = [];
+		for(const m of this.text.matchAll(re)){
+			completions.push({
+				label:m[2],
+				kind:CompletionItemKind.Variable
+			});
+		}
+
+		return completions;
+	}
+
 	protected getConditionalCompletions():CompletionItem[]{
 		const completions:CompletionItem[] = [];
 		if(!this.text.includes("contract")){
@@ -296,7 +310,7 @@ export default class CompletionService {
 	}
 
 	protected getTypesCompletions():CompletionItem[]{
-		const words = ["int", "bool", "string", "bytes", "pubkey", "sig", "datasig", "true", "false"]
+		const words = ["int", "bool", "string", "bytes", "pubkey", "sig", "datasig", "true", "false", "date"]
 		const completions = [];
 		for (let i = 0; i < words.length; i++) {
 			this.currentIndex += 1;

server/tsconfig.json

@@ -1,7 +1,7 @@
 {
 	"compilerOptions": {
 		"target": "es2019",
-		"lib": ["ES2019",  
+		"lib": ["ES2020",  
 			"es2017",
 			"esnext.bigint",
 			"dom",