From 206f77658861286a7739ade50781cf0e69f0e0f4 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 4 Apr 2024 14:48:02 +0200
Subject: [PATCH 1/5] test: Add tests to check ControlTheme Nested
 Selector/Setter Completation

---
 Directory.Build.props                        |  2 +-
 tests/CompletionEngineTests/AdvancedTests.cs | 68 +++++++++++++++++++-
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 1c4f4eb..e8303d7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
     <AvaloniaTemplatesPackageName>Avalonia.Templates</AvaloniaTemplatesPackageName>
     <AvaloniaTemplatesPackageVersion>11.0.10</AvaloniaTemplatesPackageVersion>
     <AvaloniaVersion>11.0.7</AvaloniaVersion>
-    <LangVersion>11.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/tests/CompletionEngineTests/AdvancedTests.cs b/tests/CompletionEngineTests/AdvancedTests.cs
index 3c34c40..4c00bd3 100644
--- a/tests/CompletionEngineTests/AdvancedTests.cs
+++ b/tests/CompletionEngineTests/AdvancedTests.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using Xunit;
 
@@ -487,6 +485,70 @@ public void Should_Not_Contain_Abstract_Classes()
             }
         }
 
+        [Fact]
+        public void ControlTheme_Nested_Selector_Should_Be_Completed()
+        {
+            var xaml =
+                """
+                <UserControl.Resources>
+                    <ControlTheme x:Key="MyButton" TargetType="Button">
+                        <Style Selector="
+                """;
+            var compl = GetCompletionsFor(xaml).Completions;
+
+            Assert.Single(compl);
+            Assert.Contains(compl, v => v.InsertText == "^");
+        }
+
+        [Fact]
+        public void ControlTheme_Nested_Selector_Should_Be_Completed_PseudoClass()
+        {
+            var xaml =
+                """
+                <UserControl.Resources>
+                    <ControlTheme x:Key="MyButton" TargetType="Button">
+                        <Style Selector="^:
+                """;
+            var compl = GetCompletionsFor(xaml).Completions;
+
+            Assert.Equal(10, compl.Count);
+            Assert.Contains(compl, v => v.InsertText == ":disabled");
+        }
+
+        [Fact]
+        public void ControlTheme_Nested_Selector_Should_Be_Completed_Template()
+        {
+            var xaml =
+                """
+                <UserControl.Resources>
+                    <ControlTheme x:Key="MyButton" TargetType="Button">
+                        <Style Selector="^ /template/ C
+                """;
+            var compl = GetCompletionsFor(xaml).Completions;
+
+            Assert.Contains(compl, v => v.InsertText == "ContentPresenter");
+        }
+
+        [Fact]
+        public void ControlTheme_Nested_Selector_Should_Be_Completed_Setter()
+        {
+            string[] expected = [
+                "Command",
+                "CommandParameter",
+                ];
+
+            var xaml =
+                """
+                <UserControl.Resources>
+                    <ControlTheme x:Key="MyButton" TargetType="Button">
+                        <Style Selector="^:disabled">
+                            <Setter Property="Com
+                """;
+            var compl = GetCompletionsFor(xaml).Completions.Select(c => c.InsertText);
+
+            Assert.Equal(expected, compl);
+        }
+
         public static IEnumerable<object[]> GetStyleSelectors()
         {
             yield return new object[]
@@ -609,7 +671,7 @@ public static IEnumerable<object[]> GetStyleSelectors()
                     new ("AttachedBehavior","local|AttachedBehavior", Avalonia.Ide.CompletionEngine.CompletionKind.Class | Avalonia.Ide.CompletionEngine.CompletionKind.TargetTypeClass),
                 },
             };
-            
+
             yield return new object[]
             {
                 "<Style Selector=\"ToggleSwitch /template/ #",

From 0110eb01dcc319b7725b3ef604ea6caa1ab287ee Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 4 Apr 2024 14:49:42 +0200
Subject: [PATCH 2/5] fix: Nested Selector does not detect TargetType

---
 .../Completion/CompletionEngine.cs            | 66 ++++++++++++-------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/CompletionEngine/Avalonia.Ide.CompletionEngine/Completion/CompletionEngine.cs b/CompletionEngine/Avalonia.Ide.CompletionEngine/Completion/CompletionEngine.cs
index 5c145c3..66e8a54 100644
--- a/CompletionEngine/Avalonia.Ide.CompletionEngine/Completion/CompletionEngine.cs
+++ b/CompletionEngine/Avalonia.Ide.CompletionEngine/Completion/CompletionEngine.cs
@@ -646,10 +646,19 @@ private void ProcessStyleSetter(string setterPropertyName, XmlParser state, List
         }
         else
         {
-            var selector = state.FindParentAttributeValue("Selector", 1, maxLevels: 0);
-            var matches = Regex.Matches(selector ?? "", selectorTypes);
-            var types = matches.OfType<Match>().Select(m => m.Groups["type"].Value).Where(v => !string.IsNullOrEmpty(v));
-            selectorTypeName = types.LastOrDefault()?.Replace('|', ':') ?? "Control";
+            if (state.FindParentAttributeValue("Selector", 1, maxLevels: 0)?.Trim() is { Length: > 0 } selector)
+            {
+                if (selector[0]=='^')
+                {
+                    selectorTypeName = state.FindParentAttributeValue("TargetType", 2, maxLevels: 0);
+                }
+                else
+                {
+                    var matches = Regex.Matches(selector, selectorTypes);
+                    var types = matches.OfType<Match>().Select(m => m.Groups["type"].Value).Where(v => !string.IsNullOrEmpty(v));
+                    selectorTypeName = types.LastOrDefault()?.Replace('|', ':') ?? "Control";
+                }
+            }
         }
 
         if (string.IsNullOrEmpty(selectorTypeName))
@@ -743,7 +752,7 @@ IEnumerable<Completion> forPropertiesFromType(MetadataType? filterType, string?
             {
                 foreach (var propertyName in MetadataHelper.FilterPropertyNames(filterType, filter, false, false))
                 {
-                    yield return new Completion(propertyName, fmtInsertText?.Invoke(propertyName) ?? propertyName, propertyName, CompletionKind.DataProperty, Priority:254);
+                    yield return new Completion(propertyName, fmtInsertText?.Invoke(propertyName) ?? propertyName, propertyName, CompletionKind.DataProperty, Priority: 254);
                 }
             }
         }
@@ -1027,7 +1036,7 @@ public static CompletionKind GetCompletionKindForHintValues(MetadataType type)
             case SelectorStatement.FunctionArgs:
                 {
                     var fn = parser.FunctionName;
-                    var tn = parser.TypeName;
+                    var tn = GetFullName(parser);
                     var isEmptyTn = string.IsNullOrEmpty(tn);
                     if (previousStatement <= SelectorStatement.Middle && isEmptyTn)
                     {
@@ -1050,8 +1059,7 @@ public static CompletionKind GetCompletionKindForHintValues(MetadataType type)
                     }
                     else
                     {
-                        var typeFullName = GetFullName(parser);
-                        if (Helper.LookupType(typeFullName) is MetadataType { HasPseudoClasses: true } type)
+                        if (Helper.LookupType(tn) is MetadataType { HasPseudoClasses: true } type)
                         {
                             completions.AddRange(type.PseudoClasses.Select(v => new Completion(v, CompletionKind.Selector | CompletionKind.Enum)));
                         }
@@ -1082,6 +1090,10 @@ public static CompletionKind GetCompletionKindForHintValues(MetadataType type)
                     if (parser.IsTemplate)
                     {
                         var ton = parser.TemplateOwner;
+                        if (string.IsNullOrEmpty(ton))
+                        {
+                            ton = GetTypeFromControlTheme();
+                        }
                         if (!string.IsNullOrEmpty(ton))
                         {
                             //If it hat TemplateOwner 
@@ -1144,7 +1156,6 @@ public static CompletionKind GetCompletionKindForHintValues(MetadataType type)
                                 }
                             }
                         }
-
                     }
                 }
                 break;
@@ -1259,21 +1270,25 @@ public static CompletionKind GetCompletionKindForHintValues(MetadataType type)
                     if (!parser.IsError)
                     {
                         parsed = (parser.LastParsedPosition ?? 0);
+                        var parent = state.GetParentTagName(1);
                         // TODO: Crowling Selector operator from Attribute of the Selector
                         completions.Add(new Completion("^", CompletionKind.Selector | CompletionKind.Enum));
-                        completions.Add(new Completion(":", CompletionKind.Selector | CompletionKind.Enum));
-                        completions.Add(new Completion(">", CompletionKind.Selector | CompletionKind.Enum));
-                        completions.Add(new Completion(".", CompletionKind.Selector | CompletionKind.Enum));
-                        completions.Add(new Completion("#", CompletionKind.Selector | CompletionKind.Enum));
-                        completions.Add(new Completion(":is()", ":is(", CompletionKind.Selector | CompletionKind.Enum));
-                        completions.Add(new Completion(":not()", ":not(", CompletionKind.Selector | CompletionKind.Enum));
-                        completions.Add(new Completion(":nth-child()", ":nth-child(", CompletionKind.Selector | CompletionKind.Enum));
-                        completions.Add(new Completion(":nth-last-child()", ":nth-last-child(", CompletionKind.Selector | CompletionKind.Enum));
-                        completions.Add(new Completion("/template/", "/template/", CompletionKind.Selector | CompletionKind.Enum));
-                        var types = Helper.FilterTypes(default)
-                            .Where(t => t.Value.IsAvaloniaObjectType || t.Value.HasAttachedProperties)
-                            .Select(t => new Completion(t.Value.Name.Replace(":", "|"), CompletionKind.Class | CompletionKind.TargetTypeClass));
-                        completions.AddRange(types);
+                        if (!string.Equals(parent, "ControlTheme", StringComparison.OrdinalIgnoreCase))
+                        {
+                            completions.Add(new Completion(":", CompletionKind.Selector | CompletionKind.Enum));
+                            completions.Add(new Completion(">", CompletionKind.Selector | CompletionKind.Enum));
+                            completions.Add(new Completion(".", CompletionKind.Selector | CompletionKind.Enum));
+                            completions.Add(new Completion("#", CompletionKind.Selector | CompletionKind.Enum));
+                            completions.Add(new Completion(":is()", ":is(", CompletionKind.Selector | CompletionKind.Enum));
+                            completions.Add(new Completion(":not()", ":not(", CompletionKind.Selector | CompletionKind.Enum));
+                            completions.Add(new Completion(":nth-child()", ":nth-child(", CompletionKind.Selector | CompletionKind.Enum));
+                            completions.Add(new Completion(":nth-last-child()", ":nth-last-child(", CompletionKind.Selector | CompletionKind.Enum));
+                            completions.Add(new Completion("/template/", "/template/", CompletionKind.Selector | CompletionKind.Enum));
+                            var types = Helper.FilterTypes(default)
+                                .Where(t => t.Value.IsAvaloniaObjectType || t.Value.HasAttachedProperties)
+                                .Select(t => new Completion(t.Value.Name.Replace(":", "|"), CompletionKind.Class | CompletionKind.TargetTypeClass));
+                            completions.AddRange(types);
+                        }
                     }
                 }
                 break;
@@ -1323,8 +1338,11 @@ public static CompletionKind GetCompletionKindForHintValues(MetadataType type)
         string GetFullName(SelectorParser parser)
         {
             var ns = parser.Namespace;
-            var typename = parser.TypeName
-                ?? GetTypeFromControlTheme();
+            var typename = parser.TypeName;
+            if (string.IsNullOrEmpty(typename))
+            {
+                typename = GetTypeFromControlTheme();
+            }                 
             var typeFullName = string.IsNullOrEmpty(ns)
                 ? typename
                 : $"{ns}:{typename}";

From 1a69fe90f69fabefad44e06ad842944438d05aeb Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 4 Apr 2024 17:18:19 +0200
Subject: [PATCH 3/5] fix: C.I. Build

---
 azure-pipelines.yml | 5 +++--
 global.json         | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 global.json

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fcf263c..f3a1cd1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,9 +13,10 @@ variables:
 
 steps:
 - task: UseDotNet@2
-  displayName: 'Use .NET Core SDK 7.0'
+  displayName: 'Use .NET 8.0 SDK'
   inputs:
-    version: 7.0.100
+    packageType: sdk
+    useGlobalJson: true
 
 - task: DotNetCoreCLI@2
   displayName: Restore Packages
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..d349218
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "8.0.101",
+    "rollForward": "latestFeature"
+  }
+}

From 92ba5e22442673268766341ab7369bfe146ae101 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Thu, 4 Apr 2024 17:34:33 +0200
Subject: [PATCH 4/5] fix: C.I. Test Tun

---
 tests/CompletionEngineTests/CompletionEngineTests.csproj | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/CompletionEngineTests/CompletionEngineTests.csproj b/tests/CompletionEngineTests/CompletionEngineTests.csproj
index 5d749bf..4540bf5 100644
--- a/tests/CompletionEngineTests/CompletionEngineTests.csproj
+++ b/tests/CompletionEngineTests/CompletionEngineTests.csproj
@@ -23,7 +23,10 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>

From ce75d44fc4730f155c8abd7c5ee857b35353fd5d Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Fri, 5 Apr 2024 09:33:35 +0200
Subject: [PATCH 5/5] fix: revert LangVersion to 11

---
 Directory.Build.props                        | 2 +-
 azure-pipelines.yml                          | 5 ++---
 global.json                                  | 6 ------
 tests/CompletionEngineTests/AdvancedTests.cs | 5 +++--
 4 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 global.json

diff --git a/Directory.Build.props b/Directory.Build.props
index e8303d7..1c4f4eb 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
     <AvaloniaTemplatesPackageName>Avalonia.Templates</AvaloniaTemplatesPackageName>
     <AvaloniaTemplatesPackageVersion>11.0.10</AvaloniaTemplatesPackageVersion>
     <AvaloniaVersion>11.0.7</AvaloniaVersion>
-    <LangVersion>12.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f3a1cd1..fcf263c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,10 +13,9 @@ variables:
 
 steps:
 - task: UseDotNet@2
-  displayName: 'Use .NET 8.0 SDK'
+  displayName: 'Use .NET Core SDK 7.0'
   inputs:
-    packageType: sdk
-    useGlobalJson: true
+    version: 7.0.100
 
 - task: DotNetCoreCLI@2
   displayName: Restore Packages
diff --git a/global.json b/global.json
deleted file mode 100644
index d349218..0000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "sdk": {
-    "version": "8.0.101",
-    "rollForward": "latestFeature"
-  }
-}
diff --git a/tests/CompletionEngineTests/AdvancedTests.cs b/tests/CompletionEngineTests/AdvancedTests.cs
index 4c00bd3..23b5b8b 100644
--- a/tests/CompletionEngineTests/AdvancedTests.cs
+++ b/tests/CompletionEngineTests/AdvancedTests.cs
@@ -532,10 +532,11 @@ public void ControlTheme_Nested_Selector_Should_Be_Completed_Template()
         [Fact]
         public void ControlTheme_Nested_Selector_Should_Be_Completed_Setter()
         {
-            string[] expected = [
+            string[] expected = new[]
+                {
                 "Command",
                 "CommandParameter",
-                ];
+                };
 
             var xaml =
                 """