Commitbbb2c2f

dotnet-automerge-bot

authored

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

Merge master to dev16.0

2 parents1b5a71f +4529c8f commitbbb2c2fCopy full SHA for bbb2c2f

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,8 @@ Testing the .NET Core version of the F# compiler on macOS and Linux is TBD.`
`130`	`130`
`131`	`131`	`To build and test Visual F# IDE Tools, install these requirements:`
`132`	`132`
`133`		`--[Visual Studio 2017](https://www.visualstudio.com/downloads/)`
	`133`	`+- Download[Visual Studio 2017](https://www.visualstudio.com/downloads/)`
	`134`	`+- Launch the Visual Studio Installer`
`134`	`135`	`- Under the "Windows" workloads, select ".NET desktop development"`
`135`	`136`	`- Select "F# desktop language support" under the optional components`
`136`	`137`	`- Under the "Other Toolsets" workloads, select "Visual Studio extension development"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ type internal FSharpCompletionProvider`
`221`	`221`	`let!_parsingOptions,projectOptions= projectInfoManager.TryGetOptionsForEditingDocumentOrProject(document)`
`222`	`222`	`let!textVersion= context.Document.GetTextVersionAsync(context.CancellationToken)`
`223`	`223`	`letgetAllSymbols(fileCheckResults:FSharpCheckFileResults)=`
`224`		`-if settings.IntelliSense.ShowAllSymbols`
	`224`	`+if settings.IntelliSense.IncludeSymbolsFromUnopenedNamespacesOrModules`
`225`	`225`	`then assemblyContentProvider.GetAllEntitiesInProjectAndReferencedAssemblies(fileCheckResults)`
`226`	`226`	`else[]`
`227`	`227`	`let!results=`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@ type EnterKeySetting =`
`28`	`28`	`typeIntelliSenseOptions=`
`29`	`29`	`{ ShowAfterCharIsTyped:bool`
`30`	`30`	`ShowAfterCharIsDeleted:bool`
`31`		`-ShowAllSymbols:bool`
	`31`	`+IncludeSymbolsFromUnopenedNamespacesOrModules:bool`
`32`	`32`	`EnterKeySetting:EnterKeySetting}`
`33`	`33`	`static memberDefault=`
`34`	`34`	`{ ShowAfterCharIsTyped=true`
`35`	`35`	`ShowAfterCharIsDeleted=true`
`36`		`-ShowAllSymbols=true`
	`36`	`+IncludeSymbolsFromUnopenedNamespacesOrModules=false`
`37`	`37`	`EnterKeySetting= EnterKeySetting.NeverNewline}`
`38`	`38`
`39`	`39`
`@@ -58,7 +58,7 @@ type CodeFixesOptions =`
`58`	`58`	`{// We have this off by default, disable until we work out how to make this low priority`
`59`	`59`	`// See https://github.com/Microsoft/visualfsharp/pull/3238#issue-237699595`
`60`	`60`	`SimplifyName=false`
`61`		`- AlwaysPlaceOpensAtTopLevel=false`
	`61`	`+ AlwaysPlaceOpensAtTopLevel=true`
`62`	`62`	`UnusedOpens=true`
`63`	`63`	`UnusedDeclarations=true}`
`64`	`64`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`<CheckBoxx:Name="charDeleted"IsEnabled="{Binding IsChecked, ElementName=charTyped}"IsChecked="{Binding ShowAfterCharIsDeleted}"`
`26`	`26`	`Content="{x:Static local:Strings.Show_completion_list_after_a_character_is_deleted}"/>`
`27`	`27`	`</StackPanel>`
`28`		`- <CheckBoxx:Name="showAllSymbols"IsChecked="{BindingShowAllSymbols}"`
	`28`	`+ <CheckBoxx:Name="showAllSymbols"IsChecked="{BindingIncludeSymbolsFromUnopenedNamespacesOrModules}"`
`29`	`29`	`Content="{x:Static local:Strings.Show_all_symbols}"/>`
`30`	`30`	`</StackPanel>`
`31`	`31`	`</GroupBox>`

Comments

(0)