File tree Expand file tree Collapse file tree 4 files changed +13
-5
lines changed
Expand file tree Collapse file tree 4 files changed +13
-5
lines changed Original file line number Diff line number Diff line change 88 </PropertyGroup >
99
1010 <PropertyGroup >
11- <IncludeVsLanguageServer >true</IncludeVsLanguageServer >
11+ <!-- this should be false for branch `release/dev16.2`, true otherwise -->
12+ <IncludeVsLanguageServer >false</IncludeVsLanguageServer >
1213 </PropertyGroup >
1314
1415</Project >
Original file line number Diff line number Diff line change 2828 <Action Type =" Ngen" Path =" FSharp.ProjectSystem.FSharp.dll" />
2929 <Action Type =" Ngen" Path =" FSharp.ProjectSystem.PropertyPages.dll" />
3030 <Action Type =" Ngen" Path =" FSharp.VS.FSI.dll" />
31+ <!-- this Ngen action should be disabled in branch `release/dev16.2`, enabled otherwise -->
32+ <!--
3133 <Action Type="Ngen" Path="Agent\FSharp.Compiler.LanguageServer.exe" />
34+ -->
3235 </Actions >
3336 </Installer >
3437 <Dependencies >
Original file line number Diff line number Diff line change @@ -164,7 +164,7 @@ type internal FSharpAsyncQuickInfoSource
164164 checkerProvider: FSharpCheckerProvider,
165165 projectInfoManager: FSharpProjectOptionsManager,
166166 textBuffer: ITextBuffer,
167- settings : EditorOptions
167+ _ settings : EditorOptions
168168 ) =
169169
170170 static let joinWithLineBreaks segments =
@@ -206,9 +206,10 @@ type internal FSharpAsyncQuickInfoSource
206206 // This method can be called from the background thread.
207207 // Do not call IServiceProvider.GetService here.
208208 override __.GetQuickInfoItemAsync ( session : IAsyncQuickInfoSession , cancellationToken : CancellationToken ) : Task < QuickInfoItem > =
209- // if using LSP, just bail early
210- if settings.Advanced.UsePreviewTextHover then Task.FromResult< QuickInfoItem>( null )
211- else
209+ // The following lines should be disabled for branch `release/dev16.2`, enabled otherwise
210+ //// if using LSP, just bail early
211+ //if settings.Advanced.UsePreviewTextHover then Task.FromResult<QuickInfoItem>(null)
212+ //else
212213 let triggerPoint = session.GetTriggerPoint( textBuffer.CurrentSnapshot)
213214 match triggerPoint.HasValue with
214215 | false -> Task.FromResult< QuickInfoItem>( null )
Original file line number Diff line number Diff line change 2424 <CheckBox x : Name =" toggleOutloning" IsChecked =" {Binding IsOutliningEnabled}"
2525 Content =" {x:Static local:Strings.Show_Outlining}" />
2626 </GroupBox >
27+ <!-- this group box should be disabled for branch `release/dev16.2`, enabled otherwise -->
28+ <!--
2729 <GroupBox Header="{x:Static local:Strings.Use_out_of_process_language_server}">
2830 <CheckBox x:Name="usePreviewTextHover" IsChecked="{Binding UsePreviewTextHover}"
2931 Content="{x:Static local:Strings.Text_hover}" />
3032 </GroupBox>
33+ -->
3134 </StackPanel >
3235 </ScrollViewer >
3336 </Grid >
You can’t perform that action at this time.
0 commit comments