fix after merge and updating roslyn to rc2

xamarin · Dec 15, 2016 · 34aed70 · 34aed70
1 parent 544d9ec
commit 34aed70
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/FSharp.Editor.fsproj b/FSharp.Editor.fsproj
@@ -33,22 +33,21 @@
     <Compile Include="CommonRoslynHelpers.fs" />
     <Compile Include="CommonHelpers.fs" />
     <Compile Include="LanguageService.fs" />
-    <Compile Include="Classification\ColorizationService.fs"/>
+    <Compile Include="Classification\ColorizationService.fs" />
     <Compile Include="Utilities\BraceMatchingService.fs" />
-    <Compile Include="Utilities\IndentationService.fs"/>
-    <Compile Include="Debugging\BreakpointResolutionService.fs"/>
-    <Compile Include="Debugging\LanguageDebugInfoService.fs"/>
-    <Compile Include="Diagnostics\DocumentDiagnosticAnalyzer.fs"/>
-    <Compile Include="Diagnostics\ProjectDiagnosticAnalyzer.fs"/>
-    <Compile Include="Completion\CompletionProvider.fs"/>
-    <Compile Include="Completion\SignatureHelp.fs"/>
-    <Compile Include="Navigation\GoToDefinitionService.fs"/>
+    <Compile Include="Utilities\IndentationService.fs" />
+    <Compile Include="Debugging\BreakpointResolutionService.fs" />
+    <Compile Include="Debugging\LanguageDebugInfoService.fs" />
+    <Compile Include="Diagnostics\DocumentDiagnosticAnalyzer.fs" />
+    <Compile Include="Diagnostics\ProjectDiagnosticAnalyzer.fs" />
+    <Compile Include="Completion\CompletionProvider.fs" />
+    <Compile Include="Completion\SignatureHelp.fs" />
+    <Compile Include="Navigation\GoToDefinitionService.fs" />
     <Compile Include="Navigation\NavigationBarItemService.fs" />
     <Compile Include="Navigation\NavigateToSearchService.fs" />
-    <Compile Include="BlockComment\CommentUncommentService.fs"/>
-    <Compile Include="QuickInfo\QuickInfoProvider.fs"/>
-    <Compile Include="NavigationBarItemService.fs" />
-    <Compile Include="HelpContextService.fs"/>
+    <Compile Include="BlockComment\CommentUncommentService.fs" />
+    <Compile Include="QuickInfo\QuickInfoProvider.fs" />
+    <Compile Include="HelpContextService.fs" />
     <Compile Include="ContentType.fs" />
     <Compile Include="FsiCommandService.fs" />
   </ItemGroup>

diff --git a/Navigation/NavigateToSearchService.fs b/Navigation/NavigateToSearchService.fs
@@ -55,6 +55,7 @@ type internal NavigateToSearchResult(item: NavigableItem, matchKind: NavigateToM
         member __.MatchKind = matchKind
         member __.IsCaseSensitive = false
         member __.Name = item.Name
+        member __.NameMatchSpans = ImmutableArray<_>.Empty
         member __.SecondarySort = null
         member __.Summary = null
         member __.NavigableItem = upcast item