Update function hints; bump 1.9.3

Author: Wyatt Lipscomb

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.9.3
+- Updated function hints, comments may now be placed one line above, on the same line, or a line below the function definition.
+
 # 1.9.2
 - Updated grammar to latest version of the game.
 - Fix "Go to Declaration" ([#25](https://github.com/WyattSL/greyscript/issues/25))

extension.js

@@ -10,8 +10,8 @@ var CompTypes = require("./grammar/CompletionTypes.json") // Constant 20 Functio
 var HoverData = require("./grammar/HoverData.json");
 var Encryption = require("./grammar/Encryption.json");
 
-//var bugout = vscode.window.createOutputChannel("Greyscript Debugger");
-var bugout = { appendLine: function() {}}
+var bugout = vscode.window.createOutputChannel("Greyscript Debugger");
+//var bugout = { appendLine: function() {}}
 
 var enumCompTypeText = {
     1: "method",
@@ -166,11 +166,20 @@ function activate(context) {
                 // If its a function type return the function hover
                 if(assignment.startsWith("function")) {
                     let description = null;
-                    if(linesTillCurLine[linesTillCurLine.indexOf(lines[lines.length - 1]) + 1].startsWith("//")){
-                        description = linesTillCurLine[linesTillCurLine.indexOf(lines[lines.length - 1]) + 1].substring(2).trim();
-                    }
+                    //if(linesTillCurLine[linesTillCurLine.indexOf(lines[lines.length - 1]) + 1].startsWith("//")){
+                    //    description = linesTillCurLine[linesTillCurLine.indexOf(lines[lines.length - 1]) + 1].substring(2).trim();
+                    let preline = linesTillCurLine[linesTillCurLine.indexOf(lines[lines.length - 1]) + 1]
+                    let thisline = document.getText(new vscode.Range(new vscode.Position(position.line, 0), new vscode.Position(position.line+1,0))).replace(`\n`,``)
+                    let postline = document.getText(new vscode.Range(new vscode.Position(position.line+1, 0), new vscode.Position(position.line+2,0))).replace(`\n`, ``)
+                    bugout.appendLine(preline+`\n`+thisline+`\n`+postline)
+                    bugout.appendLine(new vscode.Position(position.line, 0) + `\n` + new vscode.Position(position.line+1,0) + `\n` + new vscode.Range(new vscode.Position(position.line, 0), new vscode.Position(position.line+1,0)))
+                    if (preline.includes("//")) description = preline.replace(`//`,``);
+                    if (thisline.includes("//")) description = thisline.split(`//`)[1];
+                    if (postline.includes("//")) description = postline.replace(`//`,``);
+                    if (!description) description = ``;
+                    if (word.includes("gk")) description += `\ngk258 is my hero!`;
                     hoverText.appendCodeblock("(function) " + word + "(" +assignment.match(/(?<=\()(.*?)(?=\))/)[0] + ")")
-                    if(description) hoverText.appendText(description);
+                    if(description && description != ``) hoverText.appendText(description);
                     return new vscode.Hover(hoverText);
                 }
             }
@@ -1012,4 +1021,4 @@ let collection = vscode.languages.createDiagnosticCollection("greyscript");
 
 function deactivate() {}
 
-module.exports = {activate, deactivate};
+module.exports = {activate, deactivate};

package-lock.json

@@ -9,7 +9,7 @@
         "url": "https://github.com/WyattSL"
     },
     "icon": "icon.png",
-    "version": "1.9.2",
+    "version": "1.9.3",
     "repository": {
         "type": "git",
         "url": "https://github.com/WyattSL/greyscript.git"