handle non-regular syntax + extra test

OmniSharp · Nov 11, 2016 · 39c06ac · 39c06ac
1 parent 9a59a98
commit 39c06ac
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Types/TypeLookup.cs b/src/OmniSharp.Roslyn.CSharp/Services/Types/TypeLookup.cs
@@ -17,7 +17,7 @@ public class TypeLookupService : RequestHandler<TypeLookupRequest, TypeLookupRes
         private readonly OmnisharpWorkspace _workspace;
         private static readonly SymbolDisplayFormat DefaultFormat = SymbolDisplayFormat.FullyQualifiedFormat.WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted);
         private static readonly SymbolDisplayFormat SimpleFormat = new SymbolDisplayFormat(
-                globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Included,
+                globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,
                 typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypes,
                 genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
                 miscellaneousOptions:

diff --git a/tests/OmniSharp.Roslyn.CSharp.Tests/TypeLookupFacts.cs b/tests/OmniSharp.Roslyn.CSharp.Tests/TypeLookupFacts.cs
@@ -56,7 +56,7 @@ class Foo {}
         }
 
         [Fact]
-        public async Task IncludesContainingTypeFoNestedTypes()
+        public async Task IncludesContainingTypeFoNestedTypesForRegularCSharpSyntax()
         {
             var source1 = @"namespace Bar {
             class Foo {
@@ -71,5 +71,20 @@ class Xyz {}
 
             Assert.Equal("Bar.Foo.Xyz", response.Type);
         }
+
+        [Fact]
+        public async Task IncludesContainingTypeFoNestedTypesForNonRegularCSharpSyntax()
+        {
+            var source1 = @"class Foo {
+                class Bar {}
+            }";
+
+            var workspace = TestHelpers.CreateCsxWorkspace(source1);
+
+            var controller = new TypeLookupService(workspace, new FormattingOptions());
+            var response = await controller.Handle(new TypeLookupRequest { FileName = "dummy.csx", Line = 1, Column = 23 });
+
+            Assert.Equal("Foo.Bar", response.Type);
+        }
     }
 }