diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
index 8b0824f379526d5a36c437b3c48f4b86d4fc8e22..9785654b55e0c56dfaeee70b1dc55574b6a1dd93 100644
--- a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
+++ b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml
@@ -22,6 +22,8 @@
+ ServicesVSResources.Enable_nullable_reference_analysis_IDE_features;
+ public static string Option_use_editorconfig_compatibility_mode
+ => ServicesVSResources.Use_editorconfig_compatibility_mode;
+
public static string Option_RenameTrackingPreview => CSharpVSResources.Show_preview_for_rename_tracking;
public static string Option_Split_string_literals_on_enter => CSharpVSResources.Split_string_literals_on_enter;
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs b/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
index e3b96e687cfbd99ba1ca6cd31e12b227b0f31503..b106564765e2abc7fb64eb690d6226e57446311c 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
@@ -3381,6 +3381,15 @@ internal class ServicesVSResources {
}
}
+ ///
+ /// Looks up a localized string similar to Use .editorconfig compatibility mode (requires restart).
+ ///
+ internal static string Use_editorconfig_compatibility_mode {
+ get {
+ return ResourceManager.GetString("Use_editorconfig_compatibility_mode", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Use enhanced colors for C# and Basic.
///
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
index 60f04d933c39a568dfb2f097514b38f80f080248..1a20042f545481c5241b4f0ab8cd66c6b0e3d218 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -1340,4 +1340,7 @@ I agree to all of the foregoing:
Type ParameterThis string can be found under "Tools | Options | Text Editor | Basic | Code Style | Naming | Manage Specifications | + | Symbol kinds". All of the "NamingSpecification_VisualBasic_*" strings represent language constructs, and some of them are also actual keywords (NOT this one). Refers to the Visual Basic language concept of a "type parameter".
+
+ Use .editorconfig compatibility mode (requires restart)
+
\ No newline at end of file
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
index e3580911b298ea51caca841d28116550b3a0a1a3..1892437e39b304013072013f2f25db6ee51c6ec9 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
@@ -457,6 +457,11 @@
Nepoužitá hodnota se explicitně přiřadí k zahození.
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and BasicPro C# a Basic používat rozšířené barvy
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
index da529316c673fa24c684e38a216f38df72f91c28..9be833a8ce4cf1f455062fa6ad5ad0e7fb90f00f 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
@@ -457,6 +457,11 @@
Der nicht verwendete Wert wird explizit verworfen.
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and BasicErweiterte Farben für C# und Basic verwenden
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
index 8835540c64165dd562b89d731c2cb630ba3ea6eb..75df84b367168650c2de1260383c8f8db21c63e7 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
@@ -457,6 +457,11 @@
El valor sin usar se asigna explícitamente para descartar
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and BasicUsar los colores mejorados para C# y Basic
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
index c4fe160bec175ee40ce7b7a97a63a98b98b4cb99..ff1cce6c75a415ca59d4554a9dd23abf974d68f5 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
@@ -457,6 +457,11 @@
La valeur inutilisée est explicitement affectée à une variable discard
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and BasicUtiliser les couleurs améliorées en C# et Basic
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
index 6c00e2b41c4316ac6f25873db125ab5b54001648..ea8c73b138c80eab25147b1d3eb6b64f1a58ac71 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
@@ -457,6 +457,11 @@
Il valore inutilizzato viene assegnato in modo esplicito a discard
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and BasicUsa colori migliorati per C# e Basic
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
index 4424c7dcf818002465320d7d169ef5db232469d0..90ba19e31041174b602c49195511acb7951be22b 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
@@ -457,6 +457,11 @@
未使用の値が discard に明示的に割り当てられます
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and BasicC# および Basic で拡張された色を使用します
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
index 2320e7805de48ab18cd39951a8569a7780b55d8b..fccdba4114f1a4c34780715b83d61db57e802708 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
@@ -457,6 +457,11 @@
사용되지 않는 값이 무시 항목에 명시적으로 할당됩니다.
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and BasicC# 및 Basic에 향상된 색 사용
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
index 76dd3e53e2960f9cd584029da9f4ba2537846230..ceba9b9415a9e03c4715cf50917e18ed991e6030 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
@@ -457,6 +457,11 @@
Nieużywana wartość jest jawnie przypisywana do odrzutu
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and BasicUżyj ulepszonych kolorów dla języków C# i Basic
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
index 8c85c244dc5b0f23f895a0765864db8671aa1d36..c07e66f5324e6178201c7f9f5e37967537a79c3d 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
@@ -457,6 +457,11 @@
O valor não utilizado é explicitamente atribuído ao descarte
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and BasicUsar cores aprimoradas para C# e Basic
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
index 56930f13a037a135f3dd46a6d49b111906df7c58..6ae9c8f58c56c2371f3fcb31b1b67d3b67e46ce4 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
@@ -457,6 +457,11 @@
Неиспользуемое значение явным образом задано пустой переменной.
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and BasicИспользовать расширенные цвета для C# и Basic
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
index c16bc7e583b2317e9d7797d627e6ba6b39d3723a..4f0d06966d4213f6de1d35c4edbfc64c2bcd0a6d 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
@@ -457,6 +457,11 @@
Kullanılmayan değer açıkça atılmak üzere atandı
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and BasicC# ve Basic için gelişmiş renkleri kullan
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
index b5a4bc4eae1ef6c590c4fd4f6d7752a130140200..5a46d917123d766c68ddb16fb52e41c5aad2ab9d 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
@@ -457,6 +457,11 @@
未使用的值会显式分配以弃用
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and Basic对 C# 和 Basic 使用增强色
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
index 5305e5af34a580f09785d4d19285b34bdff9c59d..c25cdf145032137bf281ad1795b2df24e72cda9e 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
@@ -457,6 +457,11 @@
未使用的值已明確指派至捨棄
+
+ Use .editorconfig compatibility mode (requires restart)
+ Use .editorconfig compatibility mode (requires restart)
+
+ Use enhanced colors for C# and Basic使用 C# 和 Basic 的增強色彩
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
index 5577e0971a3c2700f87af4b881e719c88f00aa64..4e192b3e7dc61e0667027ae001f3caf9b74dc206 100644
--- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
+++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml
@@ -18,6 +18,8 @@
+ ());
}
+ private const string LocalRegistryPath = @"Roslyn\Internal\OnOff\Features\";
+
+ public static readonly Option UseLegacyEditorConfigSupport =
+ new Option(nameof(EditorConfigDocumentOptionsProviderFactory), nameof(UseLegacyEditorConfigSupport), defaultValue: false,
+ storageLocations: new LocalUserProfileStorageLocation(LocalRegistryPath + "UseLegacySupport"));
+
public static bool ShouldUseNativeEditorConfigSupport(Workspace workspace)
{
- var experimentationService = workspace.Services.GetService();
- return experimentationService.IsExperimentEnabled(WellKnownExperimentNames.NativeEditorConfigSupport);
+ return !workspace.Options.GetOption(UseLegacyEditorConfigSupport);
}
private class EditorConfigDocumentOptionsProvider : IDocumentOptionsProvider