Fix ScriptRegion.ContainsPosition

To actually be an inclusive check of the given point being
between the two boundary points.

Author: andyleejordan

src/PowerShellEditorServices/Services/Symbols/SymbolsService.cs

@@ -233,8 +233,8 @@ public static IEnumerable<SymbolReference> FindOccurrencesInFile(
             ScriptFile scriptFile, int line, int column)
         {
             // This needs to get by whole extent, not just the name, as it completes e.g.
-            // `Get-Process -` (after the dash) and so also needs to look backwards a column.
-            SymbolReference? symbol = scriptFile.References.TryGetSymbolContainingPosition(line, column - 1);
+            // `Get-Process -` (after the dash).
+            SymbolReference? symbol = scriptFile.References.TryGetSymbolContainingPosition(line, column);
 
             // If we are not possibly looking at a Function, we don't
             // need to continue because we won't be able to get the

src/PowerShellEditorServices/Services/TextDocument/ScriptRegion.cs

@@ -42,45 +42,11 @@ public bool IsEmpty()
                 && string.IsNullOrEmpty(Text);
         }
 
-        // Same as PowerShell's ContainsLineAndColumn
+        // Do not use PowerShell's ContainsLineAndColumn, it's nonsense.
         public bool ContainsPosition(int line, int column)
         {
-            if (StartLineNumber == line)
-            {
-                if (column == 0)
-                {
-                    return true;
-                }
-
-                if (column >= StartColumnNumber)
-                {
-                    if (EndLineNumber != StartLineNumber)
-                    {
-                        return true;
-                    }
-
-                    return column < EndColumnNumber;
-                }
-
-                return false;
-            }
-
-            if (StartLineNumber > line)
-            {
-                return false;
-            }
-
-            if (line > EndLineNumber)
-            {
-                return false;
-            }
-
-            if (EndLineNumber == line)
-            {
-                return column < EndColumnNumber;
-            }
-
-            return true;
+            return StartLineNumber <= line && line <= EndLineNumber
+                && StartColumnNumber <= column && column <= EndColumnNumber;
         }
 
         public override string ToString() => $"Start {StartLineNumber}:{StartColumnNumber}, End {EndLineNumber}:{EndColumnNumber}";

test/PowerShellEditorServices.Test.Shared/Occurrences/FindOccurrencesOnParameter.cs

@@ -11,7 +11,7 @@ public static class FindOccurrencesOnParameterData
             file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
             text: string.Empty,
             startLineNumber: 1,
-            startColumnNumber: 30,
+            startColumnNumber: 31,
             startOffset: 0,
             endLineNumber: 0,
             endColumnNumber: 0,

test/PowerShellEditorServices.Test.Shared/References/FindsReferencesOnTypeSymbols.cs

@@ -50,8 +50,8 @@ public static class FindsReferencesOnTypeSymbolsData
         public static readonly ScriptRegion PropertySourceDetails = new(
             file: TestUtilities.NormalizePath("References/TypeAndClassesFile.ps1"),
             text: string.Empty,
-            startLineNumber: 17,
-            startColumnNumber: 15,
+            startLineNumber: 35,
+            startColumnNumber: 12,
             startOffset: 0,
             endLineNumber: 0,
             endColumnNumber: 0,

test/PowerShellEditorServices.Test/Language/SymbolsServiceTests.cs

@@ -655,10 +655,12 @@ public void FindsOccurrencesOnProperty()
         [Fact]
         public async Task FindsEnumMemberDefinition()
         {
-            SymbolReference definitionResult = await GetDefinition(FindsTypeSymbolsDefinitionData.EnumMemberSourceDetails).ConfigureAwait(true);
-            Assert.Equal(41, definitionResult.ScriptRegion.StartLineNumber);
-            Assert.Equal(5, definitionResult.ScriptRegion.StartColumnNumber);
-            Assert.Equal("MyEnum.Second", definitionResult.SymbolName);
+            SymbolReference symbol = await GetDefinition(FindsTypeSymbolsDefinitionData.EnumMemberSourceDetails).ConfigureAwait(true);
+            Assert.Equal("Second", symbol.SymbolName);
+            Assert.Equal("Second", symbol.DisplayString);
+            Assert.True(symbol.IsDeclaration);
+            AssertIsRegion(symbol.NameRegion, 41, 5, 41, 11);
+            Assert.Equal(41, symbol.ScriptRegion.StartLineNumber);
         }
 
         [Fact]