Merge pull request #464 from workgroupengineering/fixes/Intellisense/…

…Issue_463 fix(Parser): FindParentAttributeValue
AvaloniaUI · Mar 28, 2024 · 08aa4ea · 08aa4ea
2 parents 377ce6e + 6bd00df
commit 08aa4ea
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/CompletionEngine/Avalonia.Ide.CompletionEngine/Parsing/XmlParser.cs b/CompletionEngine/Avalonia.Ide.CompletionEngine/Parsing/XmlParser.cs
@@ -242,7 +242,7 @@ private bool ParseChar()
     {
         if (NestingLevel - startLevel - 1 < 0)
             return null;
-        var attribRegExpr = new Regex($"\\s(?:{attributeExpr})=\"(?<AttribValue>.*?)\"");
+        var attribRegExpr = new Regex($"\\s?(?:{attributeExpr})\\s*\\=\\s*\"(?<AttribValue>.*?)\"",RegexOptions.Multiline | RegexOptions.IgnorePatternWhitespace);
         foreach (var start in _containingTagStart.Skip(startLevel))
         {
             var m = Regex.Match(_data.Span.Slice(start).ToString(), @"^<[^<]+");

diff --git a/tests/CompletionEngineTests/AdvancedTests.cs b/tests/CompletionEngineTests/AdvancedTests.cs
@@ -69,6 +69,12 @@ public void Binding_Path_Should_Be_Completed_From_xDataType()
             AssertSingleCompletion("<UserControl x:DataType=\"Button\"><TextBlock Tag=\"{Binding Path=", "Conte", "Content");
         }
 
+        [Fact]
+        public void Binding_Path_Should_Be_Completed_From_xDataType_Issue_463()
+        {
+            AssertSingleCompletion("<UserControl x:DataType= \"Button\"><TextBlock Tag=\"{Binding Path=", "Conte", "Content");
+        }
+
         [Fact]
         public void Binding_Path_Should_Be_Completed_From_xDataType2()
         {

diff --git a/tests/CompletionEngineTests/Parsing/XmlParserTests.cs b/tests/CompletionEngineTests/Parsing/XmlParserTests.cs
@@ -126,7 +126,21 @@ public void Should_GetParentTagName_At_Level(string source, int position, int le
         Assert.Equal(nestingLevelExpected, state.NestingLevel);
         var parentTag = state.GetParentTagName(level);
         Assert.Equal(expectedParentTag, parentTag);
+    }
 
+    [Theory]
+    [InlineData("<UserControl x:DataType=\"Button\"><TextBlock Tag=\"\"")]
+    [InlineData("<UserControl x:DataType= \"Button\"><TextBlock Tag=\"\"")]
+    [InlineData("<UserControl x:DataType = \"Button\"><TextBlock Tag=\"\"")]
+    [InlineData("<UserControl x:DataType =\"Button\"><TextBlock Tag=\"\"")]
+    [InlineData("<UserControl x:DataType\t=\r\"Button\"><TextBlock Tag=\"\"")]
+    [InlineData("<UserControl x:DataType\t=\n\"Button\"><TextBlock Tag=\"\"")]
+    [InlineData("<UserControl x:DataType \t=\r\"Button\"><TextBlock Tag=\"\"")]
+    [InlineData("<UserControl x:DataType\t =\r\"Button\"><TextBlock Tag=\"\"")]
+    public void Should_FindParentAttributeValue(string source)
+    {
+        var state = XmlParser.Parse(source.AsMemory(),source.Length,0);
+        Assert.NotNull(state.FindParentAttributeValue("(x\\:)?DataType"));
     }
 
     string GetData(string name, [CallerMemberName] string callerMethod = "")