File tree 4 files changed +13
-5
lines changed 4 files changed +13
-5
lines changed Original file line number Diff line number Diff line change 8
8
</PropertyGroup >
9
9
10
10
<PropertyGroup >
11
- <IncludeVsLanguageServer >true</IncludeVsLanguageServer >
11
+ <!-- this should be false for branch `release/dev16.2`, true otherwise -->
12
+ <IncludeVsLanguageServer >false</IncludeVsLanguageServer >
12
13
</PropertyGroup >
13
14
14
15
</Project >
Original file line number Diff line number Diff line change 28
28
<Action Type =" Ngen" Path =" FSharp.ProjectSystem.FSharp.dll" />
29
29
<Action Type =" Ngen" Path =" FSharp.ProjectSystem.PropertyPages.dll" />
30
30
<Action Type =" Ngen" Path =" FSharp.VS.FSI.dll" />
31
+ <!-- this Ngen action should be disabled in branch `release/dev16.2`, enabled otherwise -->
32
+ <!--
31
33
<Action Type="Ngen" Path="Agent\FSharp.Compiler.LanguageServer.exe" />
34
+ -->
32
35
</Actions >
33
36
</Installer >
34
37
<Dependencies >
Original file line number Diff line number Diff line change @@ -164,7 +164,7 @@ type internal FSharpAsyncQuickInfoSource
164
164
checkerProvider: FSharpCheckerProvider,
165
165
projectInfoManager: FSharpProjectOptionsManager,
166
166
textBuffer: ITextBuffer,
167
- settings : EditorOptions
167
+ _ settings : EditorOptions
168
168
) =
169
169
170
170
static let joinWithLineBreaks segments =
@@ -206,9 +206,10 @@ type internal FSharpAsyncQuickInfoSource
206
206
// This method can be called from the background thread.
207
207
// Do not call IServiceProvider.GetService here.
208
208
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
212
213
let triggerPoint = session.GetTriggerPoint( textBuffer.CurrentSnapshot)
213
214
match triggerPoint.HasValue with
214
215
| false -> Task.FromResult< QuickInfoItem>( null )
Original file line number Diff line number Diff line change 24
24
<CheckBox x : Name =" toggleOutloning" IsChecked =" {Binding IsOutliningEnabled}"
25
25
Content =" {x:Static local:Strings.Show_Outlining}" />
26
26
</GroupBox >
27
+ <!-- this group box should be disabled for branch `release/dev16.2`, enabled otherwise -->
28
+ <!--
27
29
<GroupBox Header="{x:Static local:Strings.Use_out_of_process_language_server}">
28
30
<CheckBox x:Name="usePreviewTextHover" IsChecked="{Binding UsePreviewTextHover}"
29
31
Content="{x:Static local:Strings.Text_hover}" />
30
32
</GroupBox>
33
+ -->
31
34
</StackPanel >
32
35
</ScrollViewer >
33
36
</Grid >
You can’t perform that action at this time.
0 commit comments