Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit 1a4d251

Browse files
brettfoKevinRansom
authored andcommitted
Merge master into vs2017-rtm (dotnet#3458)
* Document project options and mark lots of things as deprecated (dotnet#3449) * Document project options and mark lots of things as deprecated * delete some code that is no longer used * fix packaging of FSharp.Core. (dotnet#3452) * implement IDisposable interfaces explicitly (dotnet#3447) * added IDisposable * reverted Dispose change * ngen open source install (dotnet#3456) * handle "Blue (high contrast)" theme (dotnet#3443)
1 parent 483c985 commit 1a4d251

32 files changed

+57
-47
lines changed

Classification/ClassificationDefinitions.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ module internal ClassificationDefinitions =
6565
) =
6666

6767
let (| LightTheme | DarkTheme | UnknownTheme |) id =
68-
if id = KnownColorThemes.Light || id = KnownColorThemes.Blue then LightTheme
68+
if id = KnownColorThemes.Light || id = KnownColorThemes.Blue || id = Guids.blueHighContrastThemeId then LightTheme
6969
elif id = KnownColorThemes.Dark then DarkTheme
7070
else UnknownTheme
7171

Classification/ColorizationService.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ type internal FSharpColorizationService
2121
[<ImportingConstructor>]
2222
(
2323
checkerProvider: FSharpCheckerProvider,
24-
projectInfoManager: ProjectInfoManager
24+
projectInfoManager: FSharpProjectOptionsManager
2525
) =
2626
static let userOpName = "SemanticColorization"
2727

CodeFix/AddOpenCodeFixProvider.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type internal FSharpAddOpenCodeFixProvider
2222
[<ImportingConstructor>]
2323
(
2424
checkerProvider: FSharpCheckerProvider,
25-
projectInfoManager: ProjectInfoManager,
25+
projectInfoManager: FSharpProjectOptionsManager,
2626
assemblyContentProvider: AssemblyContentProvider
2727
) =
2828
inherit CodeFixProvider()

CodeFix/ImplementInterfaceCodeFixProvider.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type internal FSharpImplementInterfaceCodeFixProvider
2929
[<ImportingConstructor>]
3030
(
3131
checkerProvider: FSharpCheckerProvider,
32-
projectInfoManager: ProjectInfoManager
32+
projectInfoManager: FSharpProjectOptionsManager
3333
) =
3434
inherit CodeFixProvider()
3535
let fixableDiagnosticIds = ["FS0366"]

CodeFix/ProposeUppercaseLabel.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ type internal FSharpProposeUpperCaseLabelCodeFixProvider
1212
[<ImportingConstructor>]
1313
(
1414
checkerProvider: FSharpCheckerProvider,
15-
projectInfoManager: ProjectInfoManager
15+
projectInfoManager: FSharpProjectOptionsManager
1616
) =
1717
inherit CodeFixProvider()
1818
let fixableDiagnosticIds = ["FS0053"]

CodeFix/RemoveUnusedOpens.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ type internal FSharpRemoveUnusedOpensCodeFixProvider
1919
[<ImportingConstructor>]
2020
(
2121
checkerProvider: FSharpCheckerProvider,
22-
projectInfoManager: ProjectInfoManager
22+
projectInfoManager: FSharpProjectOptionsManager
2323
) =
2424
inherit CodeFixProvider()
2525
let fixableDiagnosticIds = [IDEDiagnosticIds.RemoveUnnecessaryImportsDiagnosticId]

CodeFix/RenameUnusedValue.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type internal FSharpRenameUnusedValueCodeFixProvider
2020
[<ImportingConstructor>]
2121
(
2222
checkerProvider: FSharpCheckerProvider,
23-
projectInfoManager: ProjectInfoManager
23+
projectInfoManager: FSharpProjectOptionsManager
2424
) =
2525

2626
inherit CodeFixProvider()

Commands/HelpContextService.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ type internal FSharpHelpContextService
1919
[<ImportingConstructor>]
2020
(
2121
checkerProvider: FSharpCheckerProvider,
22-
projectInfoManager: ProjectInfoManager
22+
projectInfoManager: FSharpProjectOptionsManager
2323
) =
2424

2525
static let userOpName = "ImplementInterfaceCodeFix"

Commands/XmlDocCommandService.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ type internal XmlDocCommandFilter
2121
wpfTextView: IWpfTextView,
2222
filePath: string,
2323
checkerProvider: FSharpCheckerProvider,
24-
projectInfoManager: ProjectInfoManager,
24+
projectInfoManager: FSharpProjectOptionsManager,
2525
workspace: VisualStudioWorkspaceImpl
2626
) =
2727

@@ -117,7 +117,7 @@ type internal XmlDocCommandFilter
117117
type internal XmlDocCommandFilterProvider
118118
[<ImportingConstructor>]
119119
(checkerProvider: FSharpCheckerProvider,
120-
projectInfoManager: ProjectInfoManager,
120+
projectInfoManager: FSharpProjectOptionsManager,
121121
workspace: VisualStudioWorkspaceImpl,
122122
textDocumentFactoryService: ITextDocumentFactoryService,
123123
editorFactory: IVsEditorAdaptersFactoryService) =

Common/Constants.fs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,5 @@ module internal Guids =
7272
[<Literal>]
7373
/// "8FDA964A-263D-4B4E-9560-29897535217C"
7474
let languageServicePerformanceOptionPageIdString = "8FDA964A-263D-4B4E-9560-29897535217C"
75+
76+
let blueHighContrastThemeId = Guid "{ce94d289-8481-498b-8ca9-9b6191a315b9}"

0 commit comments

Comments
 (0)