dot completion

Author: nathanielCherian

client/src/extension.ts

@@ -122,6 +122,7 @@ export function activate(context: ExtensionContext) {
 	vscode.languages.registerHoverProvider('cashscript', new CashscriptHoverProvider(outputChannel));	
 	vscode.languages.registerSignatureHelpProvider('cashscript', new CashscriptSignatureCompleter(outputChannel), '(');
 
+
 	// Start the client. This will also launch the server
 	client.start();
 }

client/testFixture/test.cash

@@ -17,7 +17,6 @@ contract TransferWithTimeout(pubkey sender, pubkey recipient, int timeout) {
        ; require(checkSig(recipientSig, recipient));
     }
 
-    
 
     // Require timeout time to be reached and sender's signature to match
     function timeout(sig senderSig) {

server/src/completionService.ts

@@ -1,53 +1,118 @@
-import { CompletionItem, CompletionItemKind, TextDocumentIdentifier, TextDocumentPositionParams } from 'vscode-languageserver';
-import { Position, TextDocument } from 'vscode-languageserver-textdocument';
+import { CompletionItem, CompletionItemKind, Position, Range, TextDocumentIdentifier, TextDocumentPositionParams } from 'vscode-languageserver';
+import { TextDocument } from 'vscode-languageserver-textdocument';
 
 export default class CompletionService {
 
 	protected currentIndex: number = 0;
-	private lines: string[] = [];
 	private text: string = "";
+	private offset:number = 0;
 	constructor(public doc: TextDocument|undefined, public pos: Position){
-		if(doc){
-			this.text = doc.getText();
-			this.lines = this.text.split(/\r?\n/g);
-		}
+		this.text = doc?.getText() || "";
+		this.offset = doc?.offsetAt(pos) || 0;
 	}
 
 	getAllCompletions(): CompletionItem[]{
+		console.log("completion TRIGG")
 		let completions:CompletionItem[] = [];
+
+		//completions = completions.concat(this.getDotCompletions());
+		//if(completions.length > 0) return completions;
+		if(this.isDot()){
+			return this.getDotCompletions();
+		}
+
 		completions = completions.concat(this.getControlCompletions());
 		completions = completions.concat(this.getGlobalFunctionCompletions());
 		completions = completions.concat(this.getOutputCompletions());
 		completions = completions.concat(this.getTypesCompletions());
 		completions = completions.concat(this.getGlobalConstantsCompletions());
-		completions = completions.concat(this.getDotCompletions());
 
 		return completions;
 	}
 
 	protected getCharRange(begin:number, end:number){
 		return this.text.substring(begin, end);
 	}
+
+	protected isDot():boolean{
+		const offset:number = this.doc?.offsetAt(this.pos) || 0;
+		const t = this.getCharRange(offset-1, offset);
+		if(t === '.') return true;
+		return false;
+	}
 
-	protected getDotCompletions():CompletionItem[]{
 
-		return [
-			CompletionItem.create("age")
+	DOT_COMPLETIONS:{[key:string]:CompletionItem[]} = {
+		tx:[
+			{
+				label:"time",
+				kind:CompletionItemKind.Variable
+			},
+			{
+				label:"age",
+				kind:CompletionItemKind.Variable
+			},
+			{
+				label:"version",
+				kind:CompletionItemKind.Variable
+			},
+			{
+				label:"hashPrevouts",
+				kind:CompletionItemKind.Variable
+			},
+			{
+				label:"hashSequence",
+				kind:CompletionItemKind.Variable
+			},
+			{
+				label:"outpoint",
+				kind:CompletionItemKind.Variable
+			},
+			{
+				label:"bytecode",
+				kind:CompletionItemKind.Variable
+			},
+			{
+				label:"value",
+				kind:CompletionItemKind.Variable
+			},
+			{
+				label:"sequence",
+				kind:CompletionItemKind.Variable
+			},
+			{
+				label:"hashOutputs",
+				kind:CompletionItemKind.Variable
+			},
+			{
+				label:"locktime",
+				kind:CompletionItemKind.Variable
+			},
+			{
+				label:"hashtype",
+				kind:CompletionItemKind.Variable
+			},
 		]
-		const re = /tx\./;
-		console.log(this.lines[this.pos.line]);
-		const offset:number = this.doc?.offsetAt(this.pos) || 0;
-		const t = this.getCharRange(offset-3, offset)
-		console.log("dot: ", t);
-		if(t === "tx."){
-			return [
-				CompletionItem.create("age")
-			]
+	}
+
+	protected getDotCompletions():CompletionItem[]{
+
+		const re = /(\w+).$/ // EX: "tx."
+		const range:Range = {
+			start:{character:0, line:this.pos.line},
+			end:this.pos
 		}
-		//console.log(this.doc?.getText().charAt(this.doc?.offsetAt(this.pos)-1));
-		return [
-			CompletionItem.create("tx")
-		]
+		const text = this.doc?.getText(range);
+		var arr, keyword;
+		if((arr=text?.match(re))){
+			keyword = arr[1];
+			console.log("keyword: ", keyword);
+			
+			return this.DOT_COMPLETIONS[keyword];
+		}
+
+
+		return []
 	}
 
 	protected getControlCompletions():CompletionItem[]{
@@ -71,7 +136,7 @@ export default class CompletionService {
 			{
 				label:"abs",
 				detail: 'int abs(int a): Returns the absolute value of argument a.',
-				insertText: 'abs(${1:value});',
+				insertText: 'abs(${1:value})',
 				insertTextFormat: 2,
 			},
 			{

server/src/server.ts

@@ -53,7 +53,8 @@ connection.onInitialize((params: InitializeParams) => {
 			textDocumentSync: TextDocumentSyncKind.Incremental,
 			// Tell the client that this server supports code completion.
 			completionProvider: {
-				resolveProvider: true
+				resolveProvider: true,
+				triggerCharacters:[".",]
 			},
 		}
 	};
@@ -153,7 +154,6 @@ async function validateTextDocument(textDocument: TextDocument): Promise<void> {
 	// In this simple example we get the settings for every validate run.
 	let settings = await getDocumentSettings(textDocument.uri);
 
-	console.log("triggered bo");
 	isValidatingFile = false;
 
 	// The validator creates diagnostics for all uppercase words length 2 and more
@@ -216,7 +216,6 @@ connection.onCompletion(
 		// The pass parameter contains the position of the text document in
 		// which code complete got requested. For the example we ignore this
 		// info and always provide the same completion items.
-		console.log("completion")
 		const doc: TextDocument|undefined = documents.get(_textDocumentPosition.textDocument.uri);
 		const pos: Position = _textDocumentPosition.position;
 		const cs = new CompletionService(doc, pos);