Fixed property parsing and IntelliSense

[release]
madskristensen · Jan 3, 2022 · dab15d7 · dab15d7
1 parent 5f85d2d
commit dab15d7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/src/Language/IntelliSense.cs b/src/Language/IntelliSense.cs
@@ -95,7 +95,7 @@ public Task<object> GetDescriptionAsync(IAsyncCompletionSession session, Complet
 
         public CompletionStartData InitializeCompletion(CompletionTrigger trigger, SnapshotPoint triggerLocation, CancellationToken token)
         {
-            if (trigger.Character == '\n' || trigger.Reason == CompletionTriggerReason.Deletion)
+            if (trigger.Character == '\n' || trigger.Character == ']' || trigger.Reason == CompletionTriggerReason.Deletion)
             {
                 return CompletionStartData.DoesNotParticipateInCompletion;
             }
@@ -111,12 +111,19 @@ public CompletionStartData InitializeCompletion(CompletionTrigger trigger, Snaps
             else if (item?.Type == ItemType.RegistryKey && item.Text.IndexOf("$rootkey$", StringComparison.OrdinalIgnoreCase) > -1)
             {
                 var column = triggerLocation.Position - item.Span.Start;
+
+                if (column < 1)
+                {
+                    return CompletionStartData.DoesNotParticipateInCompletion; ;
+                }
+
                 var start = item.Text.LastIndexOf('\\', column - 1) + 1;
                 var end = item.Text.IndexOf('\\', column);
                 var close = item.Text.IndexOf(']', column);
                 var textEnd = item.Text.IndexOf(']', column);
                 end = end >= start ? end : close;
                 end = end >= start ? end : textEnd;
+                end = end >= start ? end : item.Text.TrimEnd().Length;
 
                 if (end >= start)
                 {

diff --git a/src/Language/LanguageFactory.cs b/src/Language/LanguageFactory.cs
@@ -38,6 +38,7 @@ public override void SetDefaultPreferences(LanguagePreferences preferences)
             preferences.WordWrapGlyphs = true;
 
             preferences.AutoListMembers = true;
+            preferences.HideAdvancedMembers = false;
             preferences.EnableQuickInfo = true;
             preferences.ParameterInformation = true;
         }

diff --git a/src/Parser/DocumentParser.cs b/src/Parser/DocumentParser.cs
@@ -6,7 +6,7 @@ namespace PkgdefLanguage
 {
     public partial class Document
     {
-        private static readonly Regex _regexProperty = new(@"^(?<name>.+)(\s)*(?<equals>=)\s*(?<value>.+)", RegexOptions.Compiled);
+        private static readonly Regex _regexProperty = new(@"^(?<name>.+)(\s)*(?<equals>=)\s*(?<value>(dword:[\d].+|"".+))", RegexOptions.Compiled);
         private static readonly Regex _regexRef = new(@"\$[\w]+\$?", RegexOptions.Compiled);
 
         public void Parse()

diff --git a/src/PkgdefPackage.cs b/src/PkgdefPackage.cs
@@ -14,7 +14,7 @@ namespace PkgdefLanguage
     [Guid(PackageGuids.PkgdefLanguageString)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
 
-    [ProvideLanguageService(typeof(LanguageFactory), Constants.LanguageName, 0, DefaultToInsertSpaces = true, EnableLineNumbers = true, MatchBraces = true, MatchBracesAtCaret = true, EnableAsyncCompletion = true, EnableCommenting = true, ShowCompletion = true, ShowMatchingBrace = true)]
+    [ProvideLanguageService(typeof(LanguageFactory), Constants.LanguageName, 0, DefaultToInsertSpaces = true, EnableLineNumbers = true, MatchBraces = true, MatchBracesAtCaret = true, EnableAsyncCompletion = true, EnableCommenting = true, ShowCompletion = true, ShowMatchingBrace = true, HideAdvancedMembersByDefault = false)]
     [ProvideLanguageExtension(typeof(LanguageFactory), Constants.PkgDefExt)]
     [ProvideLanguageExtension(typeof(LanguageFactory), Constants.PkgUndefExt)]
     [ProvideFileIcon(Constants.PkgDefExt, "KnownMonikers.RegistrationScript")]

diff --git a/test/ParseTest.cs b/test/ParseTest.cs
@@ -28,6 +28,23 @@ public async Task SingleEntry()
             Assert.AreEqual(16, entry.Span.End);
         }
 
+        [TestMethod]
+        public async Task EqualsInPropertyValue()
+        {
+            var lines = new[] { "[test]\r\n",
+                                 "@=\"test=1234\""
+            };
+
+            var doc = Document.FromLines(lines);
+            await doc.WaitForParsingCompleteAsync();
+            var entries = doc.Items.OfType<Entry>().ToList();
+
+            Assert.AreEqual(1, entries.Count);
+
+            Entry entry = entries.First();
+            Assert.AreEqual("\"test=1234\"", entry.Properties.First().Value.Text);
+        }
+
         [TestMethod]
         public async Task MultipleEntries()
         {