Merge pull request #1086 from akshita31/gotodef

Changes for empty reponse for GoToDefinition on PropertyAccessorSymbol
OmniSharp · Jan 29, 2018 · 345f066 · 345f066
2 parents dca4795 + 6a199f4
commit 345f066
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 0 deletions.
diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Navigation/GotoDefinitionService.cs b/src/OmniSharp.Roslyn.CSharp/Services/Navigation/GotoDefinitionService.cs
@@ -50,6 +50,10 @@ public async Task<GotoDefinitionResponse> Handle(GotoDefinitionRequest request)
                     // for partial methods, pick the one with body
                     if (symbol is IMethodSymbol method)
                     {
+                        // Return an empty response for property accessor symbols like get and set
+                        if (method.AssociatedSymbol is IPropertySymbol)
+                            return response;
+
                         symbol = method.PartialImplementationPart ?? symbol;
                     }
 

diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/GoToDefinitionFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/GoToDefinitionFacts.cs
@@ -31,6 +31,110 @@ class {|def:Foo|} {
             await TestGoToSourceAsync(testFile);
         }
 
+        [Fact]
+        public async Task DoesNotReturnOnPropertAccessorGet()
+        {
+            var testFile = new TestFile("foo.cs", @"
+class Test {
+    public string Foo{ g$$et; set; }
+}");
+
+            await TestGoToSourceAsync(testFile);
+        }
+
+        [Fact]
+        public async Task DoesNotReturnOnPropertAccessorSet()
+        {
+            var testFile = new TestFile("foo.cs", @"
+class Test {
+    public int Foo{ get; s$$et; }
+}");
+
+            await TestGoToSourceAsync(testFile);
+        }
+
+        [Fact]
+        public async Task DoesNotReturnOnPropertyAccessorPropertyDef()
+        {
+            var testFile = new TestFile("foo.cs", @"
+class Test {
+    public int |def:Foo| Fo$$o{ get; set; }
+}");
+
+            await TestGoToSourceAsync(testFile);
+        }
+
+        [Fact]
+        public async Task ReturnsOnPropertyAccessorPropertySetting()
+        {
+            var testFile = new TestFile("foo.cs", @"
+class Test {
+    public int |def:Foo|{ get; set; }
+
+    public static void main()
+    {
+        F$$oo = 3;
+    }
+}");
+
+            await TestGoToSourceAsync(testFile);
+        }
+
+        [Fact]
+        public async Task ReturnsOnPropertyAccessorField1()
+        {
+            var testFile = new TestFile("foo.cs", @"
+class Test {
+
+    public int |def:foo|;
+
+    public int Foo
+    {
+        get => f$$oo;
+        set => foo = value;
+    }
+}");
+
+            await TestGoToSourceAsync(testFile);
+        }
+
+        [Fact]
+        public async Task ReturnsOnPropertyAccessorField2()
+        {
+            var testFile = new TestFile("foo.cs", @"
+class Test {
+
+    public int |def:foo|;
+
+    public int Foo
+    {
+        get => foo;
+        set => f$$oo = value;
+    }
+}");
+
+            await TestGoToSourceAsync(testFile);
+        }
+
+        [Fact]
+        public async Task ReturnsOnPropertyAccessorPropertyGetting()
+        {
+            var testFile = new TestFile("foo.cs", @"
+class Test {
+    public int |def:Foo|{ get; set; }
+
+    public static void main()
+    {
+        Foo = 3;
+    Console.WriteLine(F$$oo);
+    }
+}");
+
+            await TestGoToSourceAsync(testFile);
+        }
+
+
+
         [Theory]
         [InlineData("bar.cs")]
         [InlineData("bar.csx")]