Skip to content

[release/dev16.2] don't ship LSP in VS in release/dev16.2 #6983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brettfo merged 1 commit into from
Jun 12, 2019
Merged

[release/dev16.2] don't ship LSP in VS in release/dev16.2 #6983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion eng/targets/Settings.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
</PropertyGroup>

<PropertyGroup>
<IncludeVsLanguageServer>true</IncludeVsLanguageServer>
<!-- this should be false for branch `release/dev16.2`, true otherwise -->
<IncludeVsLanguageServer>false</IncludeVsLanguageServer>
</PropertyGroup>

</Project>
3 changes: 3 additions & 0 deletions vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@
<Action Type="Ngen" Path="FSharp.ProjectSystem.FSharp.dll" />
<Action Type="Ngen" Path="FSharp.ProjectSystem.PropertyPages.dll" />
<Action Type="Ngen" Path="FSharp.VS.FSI.dll" />
<!-- this Ngen action should be disabled in branch `release/dev16.2`, enabled otherwise -->
<!--
<Action Type="Ngen" Path="Agent\FSharp.Compiler.LanguageServer.exe" />
-->
</Actions>
</Installer>
<Dependencies>
Expand Down
9 changes: 5 additions & 4 deletions vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ type internal FSharpAsyncQuickInfoSource
checkerProvider:FSharpCheckerProvider,
projectInfoManager:FSharpProjectOptionsManager,
textBuffer:ITextBuffer,
settings: EditorOptions
_settings: EditorOptions
) =

static let joinWithLineBreaks segments =
Expand Down Expand Up @@ -206,9 +206,10 @@ type internal FSharpAsyncQuickInfoSource
// This method can be called from the background thread.
// Do not call IServiceProvider.GetService here.
override __.GetQuickInfoItemAsync(session:IAsyncQuickInfoSession, cancellationToken:CancellationToken) : Task<QuickInfoItem> =
// if using LSP, just bail early
if settings.Advanced.UsePreviewTextHover then Task.FromResult<QuickInfoItem>(null)
else
// The following lines should be disabled for branch `release/dev16.2`, enabled otherwise
//// if using LSP, just bail early
//if settings.Advanced.UsePreviewTextHover then Task.FromResult<QuickInfoItem>(null)
//else
let triggerPoint = session.GetTriggerPoint(textBuffer.CurrentSnapshot)
match triggerPoint.HasValue with
| false -> Task.FromResult<QuickInfoItem>(null)
Expand Down
3 changes: 3 additions & 0 deletions vsintegration/src/FSharp.UIResources/AdvancedOptionsControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@
<CheckBox x:Name="toggleOutloning" IsChecked="{Binding IsOutliningEnabled}"
Content="{x:Static local:Strings.Show_Outlining}"/>
</GroupBox>
<!-- this group box should be disabled for branch `release/dev16.2`, enabled otherwise -->
<!--
<GroupBox Header="{x:Static local:Strings.Use_out_of_process_language_server}">
<CheckBox x:Name="usePreviewTextHover" IsChecked="{Binding UsePreviewTextHover}"
Content="{x:Static local:Strings.Text_hover}" />
</GroupBox>
-->
</StackPanel>
</ScrollViewer>
</Grid>
Expand Down