update document symbols test

Author: fflaten

test/PowerShellEditorServices.Test.Shared/Symbols/DSCFile.ps1

@@ -0,0 +1,4 @@
+# This file represents a script with a DSC configuration
+configuration AConfiguration {
+    Node "TEST-PC" {}
+}

test/PowerShellEditorServices.Test.Shared/Symbols/FindSymbolsInDSCFile.cs

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
+
+namespace Microsoft.PowerShell.EditorServices.Test.Shared.Symbols
+{
+    public static class FindSymbolsInDSCFile
+    {
+        public static readonly ScriptRegion SourceDetails =
+            new(
+                file: TestUtilities.NormalizePath("Symbols/DSCFile.ps1"),
+                text: string.Empty,
+                startLineNumber: 0,
+                startColumnNumber: 0,
+                startOffset: 0,
+                endLineNumber: 0,
+                endColumnNumber: 0,
+                endOffset: 0);
+    }
+}

test/PowerShellEditorServices.Test.Shared/Symbols/MultipleSymbols.ps1

@@ -22,10 +22,22 @@ function AnAdvancedFunction {
 
 workflow AWorkflow {}
 
-Configuration AConfiguration {
-    Node "TEST-PC" {}
+class AClass {
+    [string]$AProperty
+
+    AClass([string]$AParameter) {
+
+    }
+
+    [void]AMethod([string]$param1, [int]$param2, $param3) {
+
+    }
+}
+
+enum AEnum {
+    AValue = 0
 }
 
 AFunction
 1..3 | AFilter
-AnAdvancedFunction
+AnAdvancedFunction

test/PowerShellEditorServices.Test/Language/SymbolsServiceTests.cs

@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Management.Automation;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -32,6 +33,7 @@ public class SymbolsServiceTests : IDisposable
         private readonly PsesInternalHost psesHost;
         private readonly WorkspaceService workspace;
         private readonly SymbolsService symbolsService;
+        private static readonly bool s_isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
 
         public SymbolsServiceTests()
         {
@@ -287,6 +289,11 @@ public void FindsSymbolsInFile()
             Assert.Equal(4, symbolsResult.Count(symbolReference => symbolReference.SymbolType == SymbolType.Function));
             Assert.Equal(3, symbolsResult.Count(symbolReference => symbolReference.SymbolType == SymbolType.Variable));
             Assert.Single(symbolsResult.Where(symbolReference => symbolReference.SymbolType == SymbolType.Workflow));
+            Assert.Single(symbolsResult.Where(symbolReference => symbolReference.SymbolType == SymbolType.Class));
+            Assert.Equal(2, symbolsResult.Count(symbolReference => symbolReference.SymbolType == SymbolType.Property));
+            Assert.Single(symbolsResult.Where(symbolReference => symbolReference.SymbolType == SymbolType.Constructor));
+            Assert.Single(symbolsResult.Where(symbolReference => symbolReference.SymbolType == SymbolType.Method));
+            Assert.Single(symbolsResult.Where(symbolReference => symbolReference.SymbolType == SymbolType.Enum));
 
             SymbolReference firstFunctionSymbol = symbolsResult.First(r => r.SymbolType == SymbolType.Function);
             Assert.Equal("AFunction", firstFunctionSymbol.SymbolName);
@@ -303,12 +310,44 @@ public void FindsSymbolsInFile()
             Assert.Equal(23, firstWorkflowSymbol.ScriptRegion.StartLineNumber);
             Assert.Equal(1, firstWorkflowSymbol.ScriptRegion.StartColumnNumber);
 
-            // TODO: Bring this back when we can use AstVisitor2 again (#276)
-            //Assert.Equal(1, symbolsResult.FoundOccurrences.Where(r => r.SymbolType == SymbolType.Configuration).Count());
-            //SymbolReference firstConfigurationSymbol = symbolsResult.FoundOccurrences.Where(r => r.SymbolType == SymbolType.Configuration).First();
-            //Assert.Equal("AConfiguration", firstConfigurationSymbol.SymbolName);
-            //Assert.Equal(25, firstConfigurationSymbol.ScriptRegion.StartLineNumber);
-            //Assert.Equal(1, firstConfigurationSymbol.ScriptRegion.StartColumnNumber);
+            SymbolReference firstClassSymbol = symbolsResult.First(r => r.SymbolType == SymbolType.Class);
+            Assert.Equal("AClass", firstClassSymbol.SymbolName);
+            Assert.Equal(25, firstClassSymbol.ScriptRegion.StartLineNumber);
+            Assert.Equal(1, firstClassSymbol.ScriptRegion.StartColumnNumber);
+
+            SymbolReference firstPropertySymbol = symbolsResult.First(r => r.SymbolType == SymbolType.Property);
+            Assert.Equal("AProperty", firstPropertySymbol.SymbolName);
+            Assert.Equal(26, firstPropertySymbol.ScriptRegion.StartLineNumber);
+            Assert.Equal(5, firstPropertySymbol.ScriptRegion.StartColumnNumber);
+
+            SymbolReference firstConstructorSymbol = symbolsResult.First(r => r.SymbolType == SymbolType.Constructor);
+            Assert.Equal("AClass([string]$AParameter)", firstConstructorSymbol.SymbolName);
+            Assert.Equal(28, firstConstructorSymbol.ScriptRegion.StartLineNumber);
+            Assert.Equal(5, firstConstructorSymbol.ScriptRegion.StartColumnNumber);
+
+            SymbolReference firstMethodSymbol = symbolsResult.First(r => r.SymbolType == SymbolType.Method);
+            Assert.Equal("AMethod([string]$param1, [int]$param2, $param3)", firstMethodSymbol.SymbolName);
+            Assert.Equal(32, firstMethodSymbol.ScriptRegion.StartLineNumber);
+            Assert.Equal(5, firstMethodSymbol.ScriptRegion.StartColumnNumber);
+
+            SymbolReference firstEnumSymbol = symbolsResult.First(r => r.SymbolType == SymbolType.Enum);
+            Assert.Equal("AEnum", firstEnumSymbol.SymbolName);
+            Assert.Equal(37, firstEnumSymbol.ScriptRegion.StartLineNumber);
+            Assert.Equal(1, firstEnumSymbol.ScriptRegion.StartColumnNumber);
+        }
+
+        [SkippableFact]
+        public void FindsSymbolsInDSCFile()
+        {
+            Skip.If(!s_isWindows, "DSC only works properly on Windows.");
+
+            List<SymbolReference> symbolsResult = FindSymbolsInFile(FindSymbolsInDSCFile.SourceDetails);
+
+            Assert.Single(symbolsResult.Where(symbolReference => symbolReference.SymbolType == SymbolType.Configuration));
+            SymbolReference firstConfigurationSymbol = symbolsResult.First(r => r.SymbolType == SymbolType.Configuration);
+            Assert.Equal("AConfiguration", firstConfigurationSymbol.SymbolName);
+            Assert.Equal(2, firstConfigurationSymbol.ScriptRegion.StartLineNumber);
+            Assert.Equal(1, firstConfigurationSymbol.ScriptRegion.StartColumnNumber);
         }
 
         [Fact]