Parse function better

Author: jcs090218

CHANGELOG.md

@@ -8,7 +8,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 ## 0.1.0 (Unreleased)
 > Released N/A
 
-- N/A
+- Fix signature help (c5a1781767cefa5281f36c3ba408985e1c52a837)
 
 ## 0.0.1
 > Released May 03, 2023

Server/Buffer.cs

@@ -1,7 +1,5 @@
-using System.Numerics;
-using OmniSharp.Extensions.LanguageServer.Protocol.Models;
+using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using ShaderlabVS;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace ShaderLS
 {
@@ -20,10 +18,27 @@ public Buffer(string text)
             SetWordsInDocuments(text);
         }
 
+        public string? GetLine(Position position)
+        {
+            if (position == null) return default;
+            string[] lines = _text.Split("\n");
+            return lines[position.Line];
+        }
+
+        public List<string>? GetLineSplit(Position position)
+        {
+            string? line = GetLine(position);
+            if (line == null) return default;
+
+            string front = line.Substring(0, position.Character);
+            string back = line.Substring(position.Character, line.Length - position.Character);
+
+            return new List<string> {  front, back };
+        }
+
         public string GetWordAtPosition(Position position)
         {
-            if (position == null)
-                return null;
+            if (position == null) return null;
 
             string[] lines = _text.Split("\n");
 
@@ -32,7 +47,7 @@ public string GetWordAtPosition(Position position)
 
             string lineStr = lines[line];
 
-            string[] words = GetWords(lineStr);
+            string[] words = Helpers.GetWords(lineStr);
 
             if (words.Length == 0)
                 return null;
@@ -68,7 +83,7 @@ private void SetWordsInDocuments(string text)
                     continue;
                 }
 
-                string[] words = GetWords(line);
+                string[] words = Helpers.GetWords(line);
 
                 foreach (var word in words)
                 {
@@ -78,13 +93,5 @@ private void SetWordsInDocuments(string text)
                 line = reader.ReadLine();
             }
         }
-
-        private string[] GetWords(string text)
-        {
-            return text.Split(
-                    new char[] { '{', '}', ' ', '\t', '(', ')', '[', ']', '+', '-', '*', '/', '%', '^', '>', '<', ':',
-                                '.', ';', '\"', '\'', '?', '\\', '&', '|', '`', '$', '#', ','},
-                    StringSplitOptions.RemoveEmptyEntries);
-        }
     }
 }

Server/BufferService.cs

@@ -37,6 +37,16 @@ public string GetText(DocumentUri key)
             return _buffers[key].GetText();
         }
 
+        public string? GetLine(DocumentUri key, Position position)
+        {
+            return _buffers[key].GetLine(position);
+        }
+
+        public List<string>? GetLineSplit(DocumentUri key, Position position)
+        {
+            return _buffers[key].GetLineSplit(position);
+        }
+
         public string GetWordAtPosition(DocumentUri key, Position position)
         {
             return _buffers[key].GetWordAtPosition(position);
@@ -47,13 +57,6 @@ public HashSet<string> Tokens(DocumentUri key)
             return _buffers[key].Tokens();
         }
 
-        //public string GetText(DocumentUri key, Position position)
-        //{
-        //    string text = GetText(key);
-        //    GetIndex(text, position);
-        //    return ;
-        //}
-
         private static int GetIndex(string buffer, Position position)
         {
             var index = 0;

Server/Handlers/SignatureHelpHandler.cs

@@ -34,15 +34,21 @@ public SignatureHelpHandler(
             var uri = request.TextDocument.Uri;
             Position position = request.Position;
 
-            string current = _workspace.BufferService.GetWordAtPosition(uri, position);
+            // Attempt to get function name.
+            List<string>? line = _workspace.BufferService.GetLineSplit(uri, position);
 
-            int newChar = Math.Max(position.Character - current.Length, 0);
-            var newPos = new Position(position.Line, newChar);
+            if (line == null)
+                return null;
 
-            // Attempt to get function name.
-            string word = _workspace.BufferService.GetWordAtPosition(uri, newPos);
+            string[] splits = line[0].Split("(", StringSplitOptions.RemoveEmptyEntries);
+
+            if (splits.Length == 0)
+                return null;
 
-            _logger.LogWarning("word: " + word);
+            int min = Math.Max(splits.Length - 2, 0);
+            splits = splits[min].Split(new char[] { '.', ' ' });
+
+            string word = splits[splits.Length - 1];
 
             var signatures = new List<SignatureInformation>();
 
@@ -72,8 +78,6 @@ public SignatureHelpHandler(
                 }
             });
 
-            var elm = signatures.ElementAt<SignatureInformation>(0);
-
             return new SignatureHelp
             {
                 Signatures = signatures

Server/Helpers.cs

@@ -5,10 +5,18 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using Range = OmniSharp.Extensions.LanguageServer.Protocol.Models.Range;
 
-namespace ShaderLS.LanguageServerProtocol
+namespace ShaderLS
 {
     public static class Helpers
     {
+        public static string[] GetWords(string text)
+        {
+            return text.Split(
+                    new char[] { '{', '}', ' ', '\t', '(', ')', '[', ']', '+', '-', '*', '/', '%', '^', '>', '<', ':',
+                                '.', ';', '\"', '\'', '?', '\\', '&', '|', '`', '$', '#', ','},
+                    StringSplitOptions.RemoveEmptyEntries);
+        }
+
         public static DocumentUri ToUri(string fileName) => DocumentUri.File(fileName);
         public static string FromUri(DocumentUri uri) => uri.GetFileSystemPath().Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
 

Server/Management/ProjectInfo.cs

@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using OmniSharp.Extensions.LanguageServer.Protocol;
-using ShaderLS.LanguageServerProtocol;
+using OmniSharp.Extensions.LanguageServer.Protocol;
 
 namespace ShaderLS.Management
 {