Skip to content

Use FSharpGlobalOptions.SetBackgroundAnalysisScope #12771

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
KevinRansom merged 4 commits into from
Mar 8, 2022
Merged

Use FSharpGlobalOptions.SetBackgroundAnalysisScope #12771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f33aede
Use FSharpGlobalOptions.SetBackgroundAnalysisScope
tmat Feb 26, 2022
cff28f0
Use IFSharpEditorFormattingServiceWithOptions
tmat Feb 26, 2022
495b621
Roslyn 4.2.0-3.22154.1
tmat Mar 4, 2022
f0cd154
Update dependencies
tmat Mar 4, 2022
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
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<EnvDTEVersion>$(VisualStudioContractPackagesVersion)</EnvDTEVersion>
<EnvDTE80Version>$(VisualStudioContractPackagesVersion)</EnvDTE80Version>
<!-- Roslyn packages -->
<RoslynVersion>4.2.0-1.22077.2</RoslynVersion>
<RoslynVersion>4.2.0-3.22154.1</RoslynVersion>
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
<MicrosoftCodeAnalysisEditorFeaturesWpfVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesWpfVersion>
Expand Down Expand Up @@ -184,7 +184,7 @@
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
<MicrosoftVisualStudioShellInterop160DesignTimeVersion>16.0.1</MicrosoftVisualStudioShellInterop160DesignTimeVersion>
<MicrosoftVisualStudioShellInterop16DesignTimeVersion>16.0.28924.11111</MicrosoftVisualStudioShellInterop16DesignTimeVersion>
<MicrosoftVisualStudioThreadingVersion>17.0.63</MicrosoftVisualStudioThreadingVersion>
<MicrosoftVisualStudioThreadingVersion>17.0.64</MicrosoftVisualStudioThreadingVersion>
<MicrosoftVisualStudioUtilitiesVersion>$(VisualStudioContractPackagesVersion)</MicrosoftVisualStudioUtilitiesVersion>
<MicrosoftVisualStudioValidationVersion>17.0.28</MicrosoftVisualStudioValidationVersion>
<MicrosoftVisualStudioWCFReferenceInteropVersion>9.0.30729</MicrosoftVisualStudioWCFReferenceInteropVersion>
Expand Down Expand Up @@ -216,8 +216,8 @@
<NunitXmlTestLoggerVersion>2.1.80</NunitXmlTestLoggerVersion>
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
<StrawberryPerlVersion>5.28.0.1</StrawberryPerlVersion>
<StreamJsonRpcVersion>2.8.28</StreamJsonRpcVersion>
<NerdbankStreamsVersion>2.7.74</NerdbankStreamsVersion>
<StreamJsonRpcVersion>2.11.14-alpha</StreamJsonRpcVersion>
<NerdbankStreamsVersion>2.8.57</NerdbankStreamsVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
</PropertyGroup>
Expand Down
9 changes: 6 additions & 3 deletions vsintegration/src/FSharp.Editor/Formatting/EditorFormattingService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,17 @@ type internal FSharpEditorFormattingService
return textChanges |> Option.defaultValue Seq.empty |> toIList
}

interface IFSharpEditorFormattingService with
interface IFSharpEditorFormattingServiceWithOptions with
member val SupportsFormatDocument = false
member val SupportsFormatSelection = false
member val SupportsFormatOnPaste = true
member val SupportsFormatOnReturn = true

override _.SupportsFormattingOnTypedCharacter (document, ch) =
if FSharpIndentationService.IsSmartIndentEnabled document.Project.Solution.Workspace.Options then
override _.SupportsFormattingOnTypedCharacter (_document, _ch) =
false

override _.SupportsFormattingOnTypedCharacter (_document, options, ch) =
if options.IndentStyle = FormattingOptions.IndentStyle.Smart then
match ch with
| ')' | ']' | '}' -> true
| _ -> false
Expand Down
3 changes: 0 additions & 3 deletions vsintegration/src/FSharp.Editor/Formatting/IndentationService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ type internal FSharpIndentationService
[<ImportingConstructor>]
() =

static member IsSmartIndentEnabled (options: Microsoft.CodeAnalysis.Options.OptionSet) =
options.GetOption(FormattingOptions.SmartIndent, FSharpConstants.FSharpLanguageName) = FormattingOptions.IndentStyle.Smart

static member IndentShouldFollow (documentId: DocumentId, sourceText: SourceText, filePath: string, position: int, parsingOptions: FSharpParsingOptions) =
let lastTokenOpt =
let defines = CompilerEnvironment.GetCompilationDefinesForEditing parsingOptions
Expand Down
3 changes: 1 addition & 2 deletions vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,9 @@ type internal FSharpLanguageService(package : FSharpPackage) =
override this.Initialize() =
base.Initialize()

this.Workspace.Options <- this.Workspace.Options.WithChangedOption(Shared.Options.FSharpServiceFeatureOnOffOptions.ClosedFileDiagnostic, FSharpConstants.FSharpLanguageName, Nullable false)

let globalOptions = package.ComponentModel.DefaultExportProvider.GetExport<FSharpGlobalOptions>().Value
globalOptions.BlockForCompletionItems <- false
globalOptions.SetBackgroundAnalysisScope(openFilesOnly=true)

let theme = package.ComponentModel.DefaultExportProvider.GetExport<ISetThemeColors>().Value
theme.SetColors()
Expand Down