Merge pull request #574 from MarkMpn/intellisense-comments

Fixed intellisense with trailing comments
MarkMpn · Nov 6, 2024 · f5cb3cd · f5cb3cd
2 parents c61a447 + ff6f01b
commit f5cb3cd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/MarkMpn.Sql4Cds.LanguageServer/Autocomplete/Autocomplete.cs b/MarkMpn.Sql4Cds.LanguageServer/Autocomplete/Autocomplete.cs
@@ -1023,6 +1023,9 @@ private bool InCommentOrStringLiteral(string text, int pos)
 
             while ((i = text.IndexOfAny(new[] { '\n', '-', '\'', '/' }, i + 1)) != -1)
             {
+                if (i > pos)
+                    break;
+
                 if (text[i] == '\n')
                     inSingleLineComment = false;
                 else if (i > 0 && !inQuotes && text[i - 1] == '-' && text[i] == '-')

diff --git a/MarkMpn.Sql4Cds.Tests/AutocompleteTests.cs b/MarkMpn.Sql4Cds.Tests/AutocompleteTests.cs
@@ -405,5 +405,17 @@ DECLARE @x varchar
 
             CollectionAssert.IsSubsetOf(new[] { "@i", "@x", "@@ROWCOUNT", "@@IDENTITY", "@@SERVERNAME", "@@VERSION" }, suggestions);
         }
+
+        [TestMethod]
+        public void TrailingComment()
+        {
+            // https://github.com/MarkMpn/Sql4Cds/issues/569
+            var prefix = "SELECT * FROM a";
+            var suffix = "\r\n-- comment";
+            var sql = prefix + suffix;
+            var suggestions = _autocomplete.GetSuggestions(sql, prefix.Length - 1).Where(s => s.ImageIndex == 4).Select(s => s.Text).ToList();
+
+            CollectionAssert.AreEqual(new[] { "account" }, suggestions);
+        }
     }
 }
diff --git a/MarkMpn.Sql4Cds.XTB/Autocomplete.cs b/MarkMpn.Sql4Cds.XTB/Autocomplete.cs
@@ -1022,6 +1022,9 @@ private bool InCommentOrStringLiteral(string text, int pos)
 
             while ((i = text.IndexOfAny(new[] { '\n', '-', '\'', '/' }, i + 1)) != -1)
             {
+                if (i > pos)
+                    break;
+
                 if (text[i] == '\n')
                     inSingleLineComment = false;
                 else if (i > 0 && !inQuotes && text[i - 1] == '-' && text[i] == '-')