From 186e361a4c6a4268abdf6415ad459f3ad2bef136 Mon Sep 17 00:00:00 2001
From: tmat <tomas.matousek@microsoft.com>
Date: Fri, 29 Apr 2022 15:09:08 -0700
Subject: [PATCH 1/3] Set Roslyn's global line formatting options

---
 .../DefaultEditorSettingsManager.cs               | 15 ++++++++++++++-
 .../DefaultEditorSettingsManagerTest.cs           |  1 +
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultEditorSettingsManager.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultEditorSettingsManager.cs
index 480b762f8ce..8ea9f8258f5 100644
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultEditorSettingsManager.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultEditorSettingsManager.cs
@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Razor.Editor;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 
 namespace Microsoft.VisualStudio.Editor.Razor
 {
@@ -17,10 +18,13 @@ internal class DefaultEditorSettingsManager : EditorSettingsManager
         public override event EventHandler<EditorSettingsChangedEventArgs> Changed;
 
         private readonly object _settingsAccessorLock = new object();
+        private readonly RazorGlobalOptions _globalOptions;
         private EditorSettings _settings;
 
         [ImportingConstructor]
-        public DefaultEditorSettingsManager([ImportMany] IEnumerable<EditorSettingsChangedTrigger> editorSettingsChangeTriggers)
+        public DefaultEditorSettingsManager(            
+            [ImportMany] IEnumerable<EditorSettingsChangedTrigger> editorSettingsChangeTriggers,
+            RazorGlobalOptions globalOptions = null)
         {
             _settings = EditorSettings.Default;
 
@@ -28,6 +32,8 @@ public DefaultEditorSettingsManager([ImportMany] IEnumerable<EditorSettingsChang
             {
                 changeTrigger.Initialize(this);
             }
+
+            _globalOptions = globalOptions;
         }
 
         public override EditorSettings Current
@@ -48,6 +54,13 @@ public override void Update(EditorSettings updatedSettings)
                 throw new ArgumentNullException(nameof(updatedSettings));
             }
 
+            // update Roslyn's global options (null in tests):
+            if (_globalOptions != null)
+            {
+                _globalOptions.TabSize = updatedSettings.IndentSize;
+                _globalOptions.UseTabs = updatedSettings.IndentWithTabs;
+            }
+
             lock (_settingsAccessorLock)
             {
                 if (!_settings.Equals(updatedSettings))
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultEditorSettingsManagerTest.cs b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultEditorSettingsManagerTest.cs
index fc308608c15..ccac6fd9069 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultEditorSettingsManagerTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultEditorSettingsManagerTest.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.CodeAnalysis.Razor.Editor;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Xunit;
 
 namespace Microsoft.VisualStudio.Editor.Razor

From 0f418455ede6411695c42d858b5617ae8f0b88d6 Mon Sep 17 00:00:00 2001
From: tmat <tomas.matousek@microsoft.com>
Date: Mon, 2 May 2022 09:02:40 -0700
Subject: [PATCH 2/3] Set defaults

---
 .../DefaultEditorSettingsManager.cs                        | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultEditorSettingsManager.cs b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultEditorSettingsManager.cs
index 8ea9f8258f5..402008b3c86 100644
--- a/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultEditorSettingsManager.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.Editor.Razor/DefaultEditorSettingsManager.cs
@@ -28,6 +28,13 @@ public DefaultEditorSettingsManager(
         {
             _settings = EditorSettings.Default;
 
+            // update Roslyn's global options (null in tests):
+            if (globalOptions != null)
+            {
+                globalOptions.TabSize = _settings.IndentSize;
+                globalOptions.UseTabs = _settings.IndentWithTabs;
+            }
+
             foreach (var changeTrigger in editorSettingsChangeTriggers)
             {
                 changeTrigger.Initialize(this);

From bf99b2ab56dc232fa74271c1a97822faf4dff1b1 Mon Sep 17 00:00:00 2001
From: tmat <tomas.matousek@microsoft.com>
Date: Tue, 10 May 2022 12:00:36 -0700
Subject: [PATCH 3/3] Update Roslyn to 4.3.0-2.22259.8

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 23ffd1ef6d8..6f35cc3474f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -76,7 +76,7 @@
     <Tooling_MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.21103.2</Tooling_MicrosoftCodeAnalysisTestingVersion>
     <MicrosoftVisualStudioShellPackagesVersion>17.2.32330.158</MicrosoftVisualStudioShellPackagesVersion>
     <MicrosoftVisualStudioPackagesVersion>17.3.37-preview</MicrosoftVisualStudioPackagesVersion>
-    <RoslynPackageVersion>4.3.0-1.22222.8</RoslynPackageVersion>
+    <RoslynPackageVersion>4.3.0-2.22259.8</RoslynPackageVersion>
     <VisualStudioLanguageServerProtocolVersion>17.3.15</VisualStudioLanguageServerProtocolVersion>
     <MicrosoftNetCompilersToolsetVersion>4.2.0-1.final</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>