未验证 提交 bbb2c2fb 编写于 作者: D dotnet-automerge-bot 提交者: GitHub

Merge pull request #5742 from Microsoft/merges/master-to-dev16.0

Merge master to dev16.0
......@@ -130,7 +130,8 @@ Testing the .NET Core version of the F# compiler on macOS and Linux is TBD.
To build and test Visual F# IDE Tools, install these requirements:
- [Visual Studio 2017](https://www.visualstudio.com/downloads/)
- Download [Visual Studio 2017](https://www.visualstudio.com/downloads/)
- Launch the Visual Studio Installer
- Under the "Windows" workloads, select ".NET desktop development"
- Select "F# desktop language support" under the optional components
- Under the "Other Toolsets" workloads, select "Visual Studio extension development"
......
......@@ -221,7 +221,7 @@ type internal FSharpCompletionProvider
let! _parsingOptions, projectOptions = projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document)
let! textVersion = context.Document.GetTextVersionAsync(context.CancellationToken)
let getAllSymbols(fileCheckResults: FSharpCheckFileResults) =
if settings.IntelliSense.ShowAllSymbols
if settings.IntelliSense.IncludeSymbolsFromUnopenedNamespacesOrModules
then assemblyContentProvider.GetAllEntitiesInProjectAndReferencedAssemblies(fileCheckResults)
else []
let! results =
......
......@@ -28,12 +28,12 @@ type EnterKeySetting =
type IntelliSenseOptions =
{ ShowAfterCharIsTyped: bool
ShowAfterCharIsDeleted: bool
ShowAllSymbols : bool
IncludeSymbolsFromUnopenedNamespacesOrModules : bool
EnterKeySetting : EnterKeySetting }
static member Default =
{ ShowAfterCharIsTyped = true
ShowAfterCharIsDeleted = true
ShowAllSymbols = true
IncludeSymbolsFromUnopenedNamespacesOrModules = false
EnterKeySetting = EnterKeySetting.NeverNewline}
......@@ -58,7 +58,7 @@ type CodeFixesOptions =
{ // We have this off by default, disable until we work out how to make this low priority
// See https://github.com/Microsoft/visualfsharp/pull/3238#issue-237699595
SimplifyName = false
AlwaysPlaceOpensAtTopLevel = false
AlwaysPlaceOpensAtTopLevel = true
UnusedOpens = true
UnusedDeclarations = true }
......
......@@ -25,7 +25,7 @@
<CheckBox x:Name="charDeleted" IsEnabled="{Binding IsChecked, ElementName=charTyped}" IsChecked="{Binding ShowAfterCharIsDeleted}"
Content="{x:Static local:Strings.Show_completion_list_after_a_character_is_deleted}"/>
</StackPanel>
<CheckBox x:Name="showAllSymbols" IsChecked="{Binding ShowAllSymbols}"
<CheckBox x:Name="showAllSymbols" IsChecked="{Binding IncludeSymbolsFromUnopenedNamespacesOrModules}"
Content="{x:Static local:Strings.Show_all_symbols}"/>
</StackPanel>
</GroupBox>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册