From 8aef4601c2dcd186c4815121a1d1033237265739 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Thu, 15 Mar 2018 21:59:50 -0700 Subject: [PATCH] Reverting regex feature work. That will go on in the regexFeatures branch --- .../BraceHighlightingTests.cs | 17 -- .../Classification/SemanticClassifierTests.cs | 235 ----------------- .../ClassificationTypeFormatDefinitions.cs | 131 ---------- .../EditorFeaturesWpfResources.Designer.cs | 72 ------ .../Core.Wpf/EditorFeaturesWpfResources.resx | 237 +++++++----------- .../xlf/EditorFeaturesWpfResources.cs.xlf | 40 --- .../xlf/EditorFeaturesWpfResources.de.xlf | 40 --- .../xlf/EditorFeaturesWpfResources.es.xlf | 40 --- .../xlf/EditorFeaturesWpfResources.fr.xlf | 40 --- .../xlf/EditorFeaturesWpfResources.it.xlf | 40 --- .../xlf/EditorFeaturesWpfResources.ja.xlf | 40 --- .../xlf/EditorFeaturesWpfResources.ko.xlf | 40 --- .../xlf/EditorFeaturesWpfResources.pl.xlf | 40 --- .../xlf/EditorFeaturesWpfResources.pt-BR.xlf | 40 --- .../xlf/EditorFeaturesWpfResources.ru.xlf | 40 --- .../xlf/EditorFeaturesWpfResources.tr.xlf | 40 --- .../EditorFeaturesWpfResources.zh-Hans.xlf | 40 --- .../EditorFeaturesWpfResources.zh-Hant.xlf | 40 --- .../BraceMatching/AbstractBraceMatcher.cs | 1 - .../ClassificationTypeDefinitions.cs | 42 ---- .../HighlighterViewTaggerProvider.cs | 9 +- ...ReferenceHighlightingViewTaggerProvider.cs | 9 +- .../Core/Tagging/TaggerContext.cs | 13 +- .../CSharpReferenceHighlightingTests.vb | 23 -- src/EditorFeatures/TestUtilities/Traits.cs | 1 - .../StringLiteralBraceMatcher.vb | 8 +- .../Classification/SemanticClassifierTests.vb | 39 +-- .../Diagnostics/Analyzers/IDEDiagnosticIds.cs | 2 - .../AbstractDocumentHighlightsService.cs | 9 +- .../Portable/FeaturesResources.Designer.cs | 37 ++- .../Core/Portable/FeaturesResources.resx | 3 - .../Portable/xlf/FeaturesResources.cs.xlf | 5 - .../Portable/xlf/FeaturesResources.de.xlf | 5 - .../Portable/xlf/FeaturesResources.es.xlf | 5 - .../Portable/xlf/FeaturesResources.fr.xlf | 5 - .../Portable/xlf/FeaturesResources.it.xlf | 5 - .../Portable/xlf/FeaturesResources.ja.xlf | 5 - .../Portable/xlf/FeaturesResources.ko.xlf | 5 - .../Portable/xlf/FeaturesResources.pl.xlf | 5 - .../Portable/xlf/FeaturesResources.pt-BR.xlf | 5 - .../Portable/xlf/FeaturesResources.ru.xlf | 5 - .../Portable/xlf/FeaturesResources.tr.xlf | 5 - .../xlf/FeaturesResources.zh-Hans.xlf | 5 - .../xlf/FeaturesResources.zh-Hant.xlf | 5 - .../Options/AdvancedOptionPageControl.xaml | 15 +- .../Options/AdvancedOptionPageControl.xaml.cs | 6 - .../Impl/Options/AdvancedOptionPageStrings.cs | 14 +- .../Core/Def/HACK_ThemeColorFixer.cs | 9 - .../Core/Def/ServicesVSResources.Designer.cs | 36 --- .../Core/Def/ServicesVSResources.resx | 12 - .../Core/Def/xlf/ServicesVSResources.cs.xlf | 20 -- .../Core/Def/xlf/ServicesVSResources.de.xlf | 20 -- .../Core/Def/xlf/ServicesVSResources.es.xlf | 20 -- .../Core/Def/xlf/ServicesVSResources.fr.xlf | 20 -- .../Core/Def/xlf/ServicesVSResources.it.xlf | 20 -- .../Core/Def/xlf/ServicesVSResources.ja.xlf | 20 -- .../Core/Def/xlf/ServicesVSResources.ko.xlf | 20 -- .../Core/Def/xlf/ServicesVSResources.pl.xlf | 20 -- .../Def/xlf/ServicesVSResources.pt-BR.xlf | 20 -- .../Core/Def/xlf/ServicesVSResources.ru.xlf | 20 -- .../Core/Def/xlf/ServicesVSResources.tr.xlf | 20 -- .../Def/xlf/ServicesVSResources.zh-Hans.xlf | 20 -- .../Def/xlf/ServicesVSResources.zh-Hant.xlf | 20 -- .../VisualBasic/Impl/BasicVSResources.resx | 6 +- .../Options/AdvancedOptionPageControl.xaml | 13 - .../Options/AdvancedOptionPageControl.xaml.vb | 5 - .../Impl/Options/AdvancedOptionPageStrings.vb | 26 +- .../Impl/xlf/BasicVSResources.cs.xlf | 10 +- .../Impl/xlf/BasicVSResources.de.xlf | 10 +- .../Impl/xlf/BasicVSResources.es.xlf | 10 +- .../Impl/xlf/BasicVSResources.fr.xlf | 10 +- .../Impl/xlf/BasicVSResources.it.xlf | 10 +- .../Impl/xlf/BasicVSResources.ja.xlf | 10 +- .../Impl/xlf/BasicVSResources.ko.xlf | 10 +- .../Impl/xlf/BasicVSResources.pl.xlf | 10 +- .../Impl/xlf/BasicVSResources.pt-BR.xlf | 10 +- .../Impl/xlf/BasicVSResources.ru.xlf | 10 +- .../Impl/xlf/BasicVSResources.tr.xlf | 10 +- .../Impl/xlf/BasicVSResources.zh-Hans.xlf | 10 +- .../Impl/xlf/BasicVSResources.zh-Hant.xlf | 10 +- 80 files changed, 211 insertions(+), 1794 deletions(-) diff --git a/src/EditorFeatures/CSharpTest/BraceHighlighting/BraceHighlightingTests.cs b/src/EditorFeatures/CSharpTest/BraceHighlighting/BraceHighlightingTests.cs index ce1a2060f49..6477cc1c3e1 100644 --- a/src/EditorFeatures/CSharpTest/BraceHighlighting/BraceHighlightingTests.cs +++ b/src/EditorFeatures/CSharpTest/BraceHighlighting/BraceHighlightingTests.cs @@ -256,22 +256,5 @@ public async Task TestTuplesWithGenerics() var x = [|(|]new Dictionary(), new List()[|)$$|]; }", TestOptions.Regular); } - - [WpfFact, Trait(Traits.Feature, Traits.Features.BraceHighlighting)] - public async Task TestRegexBracket1() - { - var input = @" -using System.Text.RegularExpressions; - -class C -{ - void Goo() - { - var r = new Regex(@""[|(|]a[|)|]$$""); - } -}"; - - await TestBraceHighlightingAsync(input); - } } } diff --git a/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs b/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs index 544405bb9d3..f74788f626f 100644 --- a/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs +++ b/src/EditorFeatures/CSharpTest/Classification/SemanticClassifierTests.cs @@ -2504,240 +2504,5 @@ interface unmanaged {} TypeParameter("T"), Keyword("unmanaged")); } - - [WpfFact, Trait(Traits.Feature, Traits.Features.Classification)] - public async Task TestRegex1() - { - await TestAsync( -@" -using System.Text.RegularExpressions; - -class Program -{ - - void Goo() - { - var r = new Regex(@""$(\a\t\u0020)|[^\p{Lu}-a\w\sa-z-[m-p]]+?(?#comment)|(\b\G\z)|(?sub){0,5}?^""); - } -}", -Keyword("var"), -Class("Regex"), -Regex.Anchor("$"), -Regex.Grouping("("), -Regex.Escape("\\"), -Regex.Escape("a"), -Regex.Escape("\\"), -Regex.Escape("t"), -Regex.Escape("\\"), -Regex.Escape("u"), -Regex.Escape("0020"), -Regex.Grouping(")"), -Regex.Alternation("|"), -Regex.CharacterClass("["), -Regex.CharacterClass("^"), -Regex.CharacterClass("\\"), -Regex.CharacterClass("p"), -Regex.CharacterClass("{"), -Regex.CharacterClass("Lu"), -Regex.CharacterClass("}"), -Regex.Text("-a"), -Regex.CharacterClass("\\"), -Regex.CharacterClass("w"), -Regex.CharacterClass("\\"), -Regex.CharacterClass("s"), -Regex.Text("a"), -Regex.CharacterClass("-"), -Regex.Text("z"), -Regex.CharacterClass("-"), -Regex.CharacterClass("["), -Regex.Text("m"), -Regex.CharacterClass("-"), -Regex.Text("p"), -Regex.CharacterClass("]"), -Regex.CharacterClass("]"), -Regex.Quantifier("+"), -Regex.Quantifier("?"), -Regex.Comment("(?#comment)"), -Regex.Alternation("|"), -Regex.Grouping("("), -Regex.Anchor("\\"), -Regex.Anchor("b"), -Regex.Anchor("\\"), -Regex.Anchor("G"), -Regex.Anchor("\\"), -Regex.Anchor("z"), -Regex.Grouping(")"), -Regex.Alternation("|"), -Regex.Grouping("("), -Regex.Grouping("?"), -Regex.Grouping("<"), -Regex.Grouping("name"), -Regex.Grouping(">"), -Regex.Text("sub"), -Regex.Grouping(")"), -Regex.Quantifier("{"), -Regex.Quantifier("0"), -Regex.Quantifier(","), -Regex.Quantifier("5"), -Regex.Quantifier("}"), -Regex.Quantifier("?"), -Regex.Anchor("^")); - } - - [WpfFact, Trait(Traits.Feature, Traits.Features.Classification)] - public async Task TestRegex2() - { - await TestAsync( -@" -using System.Text.RegularExpressions; - -class Program -{ - - void Goo() - { - // language=regex - var r = @""$(\a\t\u0020)|[^\p{Lu}-a\w\sa-z-[m-p]]+?(?#comment)|(\b\G\z)|(?sub){0,5}?^""; - } -}", -Keyword("var"), -Regex.Anchor("$"), -Regex.Grouping("("), -Regex.Escape("\\"), -Regex.Escape("a"), -Regex.Escape("\\"), -Regex.Escape("t"), -Regex.Escape("\\"), -Regex.Escape("u"), -Regex.Escape("0020"), -Regex.Grouping(")"), -Regex.Alternation("|"), -Regex.CharacterClass("["), -Regex.CharacterClass("^"), -Regex.CharacterClass("\\"), -Regex.CharacterClass("p"), -Regex.CharacterClass("{"), -Regex.CharacterClass("Lu"), -Regex.CharacterClass("}"), -Regex.Text("-a"), -Regex.CharacterClass("\\"), -Regex.CharacterClass("w"), -Regex.CharacterClass("\\"), -Regex.CharacterClass("s"), -Regex.Text("a"), -Regex.CharacterClass("-"), -Regex.Text("z"), -Regex.CharacterClass("-"), -Regex.CharacterClass("["), -Regex.Text("m"), -Regex.CharacterClass("-"), -Regex.Text("p"), -Regex.CharacterClass("]"), -Regex.CharacterClass("]"), -Regex.Quantifier("+"), -Regex.Quantifier("?"), -Regex.Comment("(?#comment)"), -Regex.Alternation("|"), -Regex.Grouping("("), -Regex.Anchor("\\"), -Regex.Anchor("b"), -Regex.Anchor("\\"), -Regex.Anchor("G"), -Regex.Anchor("\\"), -Regex.Anchor("z"), -Regex.Grouping(")"), -Regex.Alternation("|"), -Regex.Grouping("("), -Regex.Grouping("?"), -Regex.Grouping("<"), -Regex.Grouping("name"), -Regex.Grouping(">"), -Regex.Text("sub"), -Regex.Grouping(")"), -Regex.Quantifier("{"), -Regex.Quantifier("0"), -Regex.Quantifier(","), -Regex.Quantifier("5"), -Regex.Quantifier("}"), -Regex.Quantifier("?"), -Regex.Anchor("^")); - } - - [WpfFact, Trait(Traits.Feature, Traits.Features.Classification)] - public async Task TestRegex3() - { - await TestAsync( -@" -using System.Text.RegularExpressions; - -class Program -{ - void Goo() - { - var r = /* language=regex */@""$(\a\t\u0020)|[^\p{Lu}-a\w\sa-z-[m-p]]+?(?#comment)|(\b\G\z)|(?sub){0,5}?^""; - } -}", -Keyword("var"), -Regex.Anchor("$"), -Regex.Grouping("("), -Regex.Escape("\\"), -Regex.Escape("a"), -Regex.Escape("\\"), -Regex.Escape("t"), -Regex.Escape("\\"), -Regex.Escape("u"), -Regex.Escape("0020"), -Regex.Grouping(")"), -Regex.Alternation("|"), -Regex.CharacterClass("["), -Regex.CharacterClass("^"), -Regex.CharacterClass("\\"), -Regex.CharacterClass("p"), -Regex.CharacterClass("{"), -Regex.CharacterClass("Lu"), -Regex.CharacterClass("}"), -Regex.Text("-a"), -Regex.CharacterClass("\\"), -Regex.CharacterClass("w"), -Regex.CharacterClass("\\"), -Regex.CharacterClass("s"), -Regex.Text("a"), -Regex.CharacterClass("-"), -Regex.Text("z"), -Regex.CharacterClass("-"), -Regex.CharacterClass("["), -Regex.Text("m"), -Regex.CharacterClass("-"), -Regex.Text("p"), -Regex.CharacterClass("]"), -Regex.CharacterClass("]"), -Regex.Quantifier("+"), -Regex.Quantifier("?"), -Regex.Comment("(?#comment)"), -Regex.Alternation("|"), -Regex.Grouping("("), -Regex.Anchor("\\"), -Regex.Anchor("b"), -Regex.Anchor("\\"), -Regex.Anchor("G"), -Regex.Anchor("\\"), -Regex.Anchor("z"), -Regex.Grouping(")"), -Regex.Alternation("|"), -Regex.Grouping("("), -Regex.Grouping("?"), -Regex.Grouping("<"), -Regex.Grouping("name"), -Regex.Grouping(">"), -Regex.Text("sub"), -Regex.Grouping(")"), -Regex.Quantifier("{"), -Regex.Quantifier("0"), -Regex.Quantifier(","), -Regex.Quantifier("5"), -Regex.Quantifier("}"), -Regex.Quantifier("?"), -Regex.Anchor("^")); - } } } diff --git a/src/EditorFeatures/Core.Wpf/Classification/ClassificationTypeFormatDefinitions.cs b/src/EditorFeatures/Core.Wpf/Classification/ClassificationTypeFormatDefinitions.cs index a39fe3e456b..4074afc1ab9 100644 --- a/src/EditorFeatures/Core.Wpf/Classification/ClassificationTypeFormatDefinitions.cs +++ b/src/EditorFeatures/Core.Wpf/Classification/ClassificationTypeFormatDefinitions.cs @@ -343,137 +343,6 @@ private XmlDocCommentTextFormatDefinition() } #endregion - #region Regex - Comment - [Export(typeof(EditorFormatDefinition))] - [ClassificationType(ClassificationTypeNames = ClassificationTypeNames.RegexComment)] - [Name(ClassificationTypeNames.RegexComment)] - [Order(After = ClassificationTypeNames.StringLiteral)] - [Order(After = ClassificationTypeNames.VerbatimStringLiteral)] - [UserVisible(true)] - [ExcludeFromCodeCoverage] - private class RegexCommentFormatDefinition : ClassificationFormatDefinition - { - private RegexCommentFormatDefinition() - { - this.DisplayName = EditorFeaturesWpfResources.Regex_Comment; - this.ForegroundColor = Color.FromRgb(87, 166, 74); - } - } - [Export(typeof(EditorFormatDefinition))] - [ClassificationType(ClassificationTypeNames = ClassificationTypeNames.RegexText)] - [Name(ClassificationTypeNames.RegexText)] - [Order(After = ClassificationTypeNames.StringLiteral)] - [Order(After = ClassificationTypeNames.VerbatimStringLiteral)] - [UserVisible(true)] - [ExcludeFromCodeCoverage] - private class RegexTextFormatDefinition : ClassificationFormatDefinition - { - private RegexTextFormatDefinition() - { - this.DisplayName = EditorFeaturesWpfResources.Regex_Text; - this.ForegroundColor = Color.FromRgb(192, 192, 192); - } - } - - [Export(typeof(EditorFormatDefinition))] - [ClassificationType(ClassificationTypeNames = ClassificationTypeNames.RegexCharacterClass)] - [Name(ClassificationTypeNames.RegexCharacterClass)] - [Order(After = ClassificationTypeNames.StringLiteral)] - [Order(After = ClassificationTypeNames.VerbatimStringLiteral)] - [UserVisible(true)] - [ExcludeFromCodeCoverage] - private class RegexCharacterClassFormatDefinition : ClassificationFormatDefinition - { - private RegexCharacterClassFormatDefinition() - { - this.DisplayName = EditorFeaturesWpfResources.Regex_Character_class; - this.ForegroundColor = Color.FromRgb(216, 80, 80); - } - } - - [Export(typeof(EditorFormatDefinition))] - [ClassificationType(ClassificationTypeNames = ClassificationTypeNames.RegexQuantifier)] - [Name(ClassificationTypeNames.RegexQuantifier)] - [Order(After = ClassificationTypeNames.StringLiteral)] - [Order(After = ClassificationTypeNames.VerbatimStringLiteral)] - [UserVisible(true)] - [ExcludeFromCodeCoverage] - private class RegexQuantifierFormatDefinition : ClassificationFormatDefinition - { - private RegexQuantifierFormatDefinition() - { - this.DisplayName = EditorFeaturesWpfResources.Regex_Quantifier; - this.ForegroundColor = Color.FromRgb(95, 149, 250); - } - } - - [Export(typeof(EditorFormatDefinition))] - [ClassificationType(ClassificationTypeNames = ClassificationTypeNames.RegexAnchor)] - [Name(ClassificationTypeNames.RegexAnchor)] - [Order(After = ClassificationTypeNames.StringLiteral)] - [Order(After = ClassificationTypeNames.VerbatimStringLiteral)] - [UserVisible(true)] - [ExcludeFromCodeCoverage] - private class RegexAnchorFormatDefinition : ClassificationFormatDefinition - { - private RegexAnchorFormatDefinition() - { - this.DisplayName = EditorFeaturesWpfResources.Regex_Anchor; - this.ForegroundColor = Color.FromRgb(202, 121, 236); - } - } - - [Export(typeof(EditorFormatDefinition))] - [ClassificationType(ClassificationTypeNames = ClassificationTypeNames.RegexAlternation)] - [Name(ClassificationTypeNames.RegexAlternation)] - [Order(After = ClassificationTypeNames.StringLiteral)] - [Order(After = ClassificationTypeNames.VerbatimStringLiteral)] - [UserVisible(true)] - [ExcludeFromCodeCoverage] - private class RegexAlternationFormatDefinition : ClassificationFormatDefinition - { - private RegexAlternationFormatDefinition() - { - this.DisplayName = EditorFeaturesWpfResources.Regex_Alternation; - this.ForegroundColor = Color.FromRgb(255, 255, 0); - } - } - - [Export(typeof(EditorFormatDefinition))] - [ClassificationType(ClassificationTypeNames = ClassificationTypeNames.RegexEscape)] - [Name(ClassificationTypeNames.RegexEscape)] - [Order(After = ClassificationTypeNames.StringLiteral)] - [Order(After = ClassificationTypeNames.VerbatimStringLiteral)] - [UserVisible(true)] - [ExcludeFromCodeCoverage] - private class RegexEscapeFormatDefinition : ClassificationFormatDefinition - { - private RegexEscapeFormatDefinition() - { - this.DisplayName = EditorFeaturesWpfResources.Regex_Escape; - this.ForegroundColor = Color.FromRgb(255, 128, 9); - } - } - - [Export(typeof(EditorFormatDefinition))] - [ClassificationType(ClassificationTypeNames = ClassificationTypeNames.RegexGrouping)] - [Name(ClassificationTypeNames.RegexGrouping)] - [Order(After = ClassificationTypeNames.StringLiteral)] - [Order(After = ClassificationTypeNames.VerbatimStringLiteral)] - [UserVisible(true)] - [ExcludeFromCodeCoverage] - private class RegexGroupingFormatDefinition : ClassificationFormatDefinition - { - private RegexGroupingFormatDefinition() - { - this.DisplayName = EditorFeaturesWpfResources.Regex_Grouping; - - this.ForegroundColor = Color.FromRgb(78, 201, 176); - } - } - #endregion - - #region VB XML Literals - Attribute Name [Export(typeof(EditorFormatDefinition))] [ClassificationType(ClassificationTypeNames = ClassificationTypeNames.XmlLiteralAttributeName)] diff --git a/src/EditorFeatures/Core.Wpf/EditorFeaturesWpfResources.Designer.cs b/src/EditorFeatures/Core.Wpf/EditorFeaturesWpfResources.Designer.cs index c568c314e68..8eaeffec0a5 100644 --- a/src/EditorFeatures/Core.Wpf/EditorFeaturesWpfResources.Designer.cs +++ b/src/EditorFeatures/Core.Wpf/EditorFeaturesWpfResources.Designer.cs @@ -86,77 +86,5 @@ internal class EditorFeaturesWpfResources { return ResourceManager.GetString("Downloading_IntelliSense_index_for_0", resourceCulture); } } - - /// - /// Looks up a localized string similar to Regex - Alternation. - /// - internal static string Regex_Alternation { - get { - return ResourceManager.GetString("Regex_Alternation", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Regex - Anchor. - /// - internal static string Regex_Anchor { - get { - return ResourceManager.GetString("Regex_Anchor", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Regex - Character class. - /// - internal static string Regex_Character_class { - get { - return ResourceManager.GetString("Regex_Character_class", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Regex - Comment. - /// - internal static string Regex_Comment { - get { - return ResourceManager.GetString("Regex_Comment", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Regex - Escape. - /// - internal static string Regex_Escape { - get { - return ResourceManager.GetString("Regex_Escape", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Regex - Grouping. - /// - internal static string Regex_Grouping { - get { - return ResourceManager.GetString("Regex_Grouping", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Regex - Quantifier. - /// - internal static string Regex_Quantifier { - get { - return ResourceManager.GetString("Regex_Quantifier", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Regex - Text. - /// - internal static string Regex_Text { - get { - return ResourceManager.GetString("Regex_Text", resourceCulture); - } - } } } diff --git a/src/EditorFeatures/Core.Wpf/EditorFeaturesWpfResources.resx b/src/EditorFeatures/Core.Wpf/EditorFeaturesWpfResources.resx index a6b34b776c0..3a8172ca17c 100644 --- a/src/EditorFeatures/Core.Wpf/EditorFeaturesWpfResources.resx +++ b/src/EditorFeatures/Core.Wpf/EditorFeaturesWpfResources.resx @@ -1,122 +1,103 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Version 1.3 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + text/microsoft-resx + 1.3 + System.Resources.ResXResourceReader, System.Windows.Forms, ... + System.Resources.ResXResourceWriter, System.Windows.Forms, ... + this is my long string + Blue + + [base64 mime encoded serialized .NET Framework object] + + + [base64 mime encoded string representing a byte array form of the .NET Framework object] + + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 1.3 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + Downloading index failed @@ -126,28 +107,4 @@ Downloading IntelliSense index for {0} - - Regex - Comment - - - Regex - Character class - - - Regex - Alternation - - - Regex - Anchor - - - Regex - Quantifier - - - Regex - Escape - - - Regex - Grouping - - - Regex - Text - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.cs.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.cs.xlf index dfb30b39a83..df67300fb1b 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.cs.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.cs.xlf @@ -17,46 +17,6 @@ Stahuje se index IntelliSense pro {0}. - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.de.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.de.xlf index 3f4e185bb2f..4610171c440 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.de.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.de.xlf @@ -17,46 +17,6 @@ Der IntelliSense-Index für "{0}" wird heruntergeladen. - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.es.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.es.xlf index f2256475634..8265148388f 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.es.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.es.xlf @@ -17,46 +17,6 @@ Descargando el índice de IntelliSense para {0} - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.fr.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.fr.xlf index d04da22195c..2d10c67cb48 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.fr.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.fr.xlf @@ -17,46 +17,6 @@ Téléchargement de l'index IntelliSense pour {0} - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.it.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.it.xlf index 5da82fac9e4..f6a7e7f47fc 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.it.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.it.xlf @@ -17,46 +17,6 @@ Download dell'indice IntelliSense per {0} - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ja.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ja.xlf index 74306c14c0f..5b9c1f072c1 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ja.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ja.xlf @@ -17,46 +17,6 @@ {0} の IntelliSense インデックスをダウンロードしています - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ko.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ko.xlf index af4494b5bdb..2b83042f21f 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ko.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ko.xlf @@ -17,46 +17,6 @@ {0}의 IntelliSense 인덱스 다운로드 중 - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.pl.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.pl.xlf index 028f2a51857..7f49c091219 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.pl.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.pl.xlf @@ -17,46 +17,6 @@ Pobieranie indeksu funkcji IntelliSense dla {0} - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.pt-BR.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.pt-BR.xlf index 796248eb59d..5838ac902a2 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.pt-BR.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.pt-BR.xlf @@ -17,46 +17,6 @@ Baixando o índice do IntelliSense para {0} - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ru.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ru.xlf index efa7748f234..74a08e58f69 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ru.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.ru.xlf @@ -17,46 +17,6 @@ Загрузка индекса IntelliSense для {0} - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.tr.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.tr.xlf index 9f59c6ba296..92c73bd006d 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.tr.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.tr.xlf @@ -17,46 +17,6 @@ {0} için IntelliSense dizini indiriliyor - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.zh-Hans.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.zh-Hans.xlf index 83cf5a18b61..9d59921b63a 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.zh-Hans.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.zh-Hans.xlf @@ -17,46 +17,6 @@ 正在下载用于 {0} 的 IntelliSense 索引 - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.zh-Hant.xlf b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.zh-Hant.xlf index b528d66936f..0662455cbf1 100644 --- a/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.zh-Hant.xlf +++ b/src/EditorFeatures/Core.Wpf/xlf/EditorFeaturesWpfResources.zh-Hant.xlf @@ -17,46 +17,6 @@ 正在為 {0} 下載 IntelliSense 索引 - - Regex - Comment - Regex - Comment - - - - Regex - Character class - Regex - Character class - - - - Regex - Quantifier - Regex - Quantifier - - - - Regex - Anchor - Regex - Anchor - - - - Regex - Alternation - Regex - Alternation - - - - Regex - Text - Regex - Text - - - - Regex - Escape - Regex - Escape - - - - Regex - Grouping - Regex - Grouping - - \ No newline at end of file diff --git a/src/EditorFeatures/Core/Implementation/BraceMatching/AbstractBraceMatcher.cs b/src/EditorFeatures/Core/Implementation/BraceMatching/AbstractBraceMatcher.cs index 9ae0b8cfab2..93fccabedc2 100644 --- a/src/EditorFeatures/Core/Implementation/BraceMatching/AbstractBraceMatcher.cs +++ b/src/EditorFeatures/Core/Implementation/BraceMatching/AbstractBraceMatcher.cs @@ -1,6 +1,5 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/src/EditorFeatures/Core/Implementation/Classification/ClassificationTypeDefinitions.cs b/src/EditorFeatures/Core/Implementation/Classification/ClassificationTypeDefinitions.cs index 80cae791b65..891e66afe52 100644 --- a/src/EditorFeatures/Core/Implementation/Classification/ClassificationTypeDefinitions.cs +++ b/src/EditorFeatures/Core/Implementation/Classification/ClassificationTypeDefinitions.cs @@ -134,48 +134,6 @@ internal sealed class ClassificationTypeDefinitions internal readonly ClassificationTypeDefinition XmlDocCommentTextTypeDefinition; #endregion - #region Regex - [Export] - [Name(ClassificationTypeNames.RegexComment)] - [BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)] - internal readonly ClassificationTypeDefinition RegexCommentTypeDefinition; - - [Export] - [Name(ClassificationTypeNames.RegexText)] - [BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)] - internal readonly ClassificationTypeDefinition RegexTextTypeDefinition; - - [Export] - [Name(ClassificationTypeNames.RegexCharacterClass)] - [BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)] - internal readonly ClassificationTypeDefinition RegexCharacterClassTypeDefinition; - - [Export] - [Name(ClassificationTypeNames.RegexQuantifier)] - [BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)] - internal readonly ClassificationTypeDefinition RegexQuantifierTypeDefinition; - - [Export] - [Name(ClassificationTypeNames.RegexAnchor)] - [BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)] - internal readonly ClassificationTypeDefinition RegexAnchorTypeDefinition; - - [Export] - [Name(ClassificationTypeNames.RegexAlternation)] - [BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)] - internal readonly ClassificationTypeDefinition RegexAlternationTypeDefinition; - - [Export] - [Name(ClassificationTypeNames.RegexEscape)] - [BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)] - internal readonly ClassificationTypeDefinition RegexEscapeTypeDefinition; - - [Export] - [Name(ClassificationTypeNames.RegexGrouping)] - [BaseDefinition(PredefinedClassificationTypeNames.FormalLanguage)] - internal readonly ClassificationTypeDefinition RegexGroupingTypeDefinition; - #endregion - #region VB XML Literals - Attribute Name [Export] [Name(ClassificationTypeNames.XmlLiteralAttributeName)] diff --git a/src/EditorFeatures/Core/Implementation/KeywordHighlighting/HighlighterViewTaggerProvider.cs b/src/EditorFeatures/Core/Implementation/KeywordHighlighting/HighlighterViewTaggerProvider.cs index cb1a8371539..0ce85d1ba96 100644 --- a/src/EditorFeatures/Core/Implementation/KeywordHighlighting/HighlighterViewTaggerProvider.cs +++ b/src/EditorFeatures/Core/Implementation/KeywordHighlighting/HighlighterViewTaggerProvider.cs @@ -76,13 +76,12 @@ protected override async Task ProduceTagsAsync(TaggerContext()); return; } diff --git a/src/EditorFeatures/Core/ReferenceHighlighting/ReferenceHighlightingViewTaggerProvider.cs b/src/EditorFeatures/Core/ReferenceHighlighting/ReferenceHighlightingViewTaggerProvider.cs index 0e3192ce019..6107fa6c786 100644 --- a/src/EditorFeatures/Core/ReferenceHighlighting/ReferenceHighlightingViewTaggerProvider.cs +++ b/src/EditorFeatures/Core/ReferenceHighlighting/ReferenceHighlightingViewTaggerProvider.cs @@ -104,13 +104,12 @@ protected override Task ProduceTagsAsync(TaggerContext co return SpecializedTasks.EmptyTask; } - // See if the user is just moving their caret around in an existing tag. If so, we don't - // want to actually go recompute things. Note: this only works for containment. If the - // user moves their caret to the end of a highlighted reference, we do want to recompute - // as they may now be at the start of some other reference that should be highlighted instead. - var existingTags = context.GetExistingContainingTags(caretPosition); + var existingTags = context.GetExistingTags(new SnapshotSpan(caretPosition, 0)); if (!existingTags.IsEmpty()) { + // We already have a tag at this position. So the user is moving from one highlight + // tag to another. In this case we don't want to recompute anything. Let our caller + // know that we should preserve all tags. context.SetSpansTagged(SpecializedCollections.EmptyEnumerable()); return SpecializedTasks.EmptyTask; } diff --git a/src/EditorFeatures/Core/Tagging/TaggerContext.cs b/src/EditorFeatures/Core/Tagging/TaggerContext.cs index 6a82be1c4ac..9db4ad0897b 100644 --- a/src/EditorFeatures/Core/Tagging/TaggerContext.cs +++ b/src/EditorFeatures/Core/Tagging/TaggerContext.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Linq; using System.Threading; using Microsoft.CodeAnalysis.Editor.Shared.Tagging; using Microsoft.CodeAnalysis.Text; @@ -87,15 +86,11 @@ public void SetSpansTagged(IEnumerable spansTagged) this._spansTagged = spansTagged ?? throw new ArgumentNullException(nameof(spansTagged)); } - public IEnumerable> GetExistingContainingTags(SnapshotPoint point) + public IEnumerable> GetExistingTags(SnapshotSpan span) { - if (_existingTags != null && _existingTags.TryGetValue(point.Snapshot.TextBuffer, out var tree)) - { - return tree.GetIntersectingSpans(new SnapshotSpan(point.Snapshot, new Span(point, 0))) - .Where(s => s.Span.Contains(point)); - } - - return SpecializedCollections.EmptyEnumerable>(); + return _existingTags != null && _existingTags.TryGetValue(span.Snapshot.TextBuffer, out var tree) + ? tree.GetIntersectingSpans(span) + : SpecializedCollections.EmptyEnumerable>(); } } } diff --git a/src/EditorFeatures/Test2/ReferenceHighlighting/CSharpReferenceHighlightingTests.vb b/src/EditorFeatures/Test2/ReferenceHighlighting/CSharpReferenceHighlightingTests.vb index 52043d982f9..3e12a8c68d0 100644 --- a/src/EditorFeatures/Test2/ReferenceHighlighting/CSharpReferenceHighlightingTests.vb +++ b/src/EditorFeatures/Test2/ReferenceHighlighting/CSharpReferenceHighlightingTests.vb @@ -672,28 +672,5 @@ class C Await VerifyHighlightsAsync(input) End Function - - - Public Async Function TestRegexReference1() As Task - - Dim input = - - - -using System.Text.RegularExpressions; - -class C -{ - void Goo() - { - var r = new Regex(@"{|Reference:(a)|}\0{|Reference:\$$1|}"); - } -} - - - - - Await VerifyHighlightsAsync(input) - End Function End Class End Namespace diff --git a/src/EditorFeatures/TestUtilities/Traits.cs b/src/EditorFeatures/TestUtilities/Traits.cs index 6a666524b04..6a2071df6ed 100644 --- a/src/EditorFeatures/TestUtilities/Traits.cs +++ b/src/EditorFeatures/TestUtilities/Traits.cs @@ -187,7 +187,6 @@ public static class Features public const string TypeInferenceService = nameof(TypeInferenceService); public const string Venus = nameof(Venus); public const string ValidateFormatString = nameof(ValidateFormatString); - public const string ValidateRegexString = nameof(ValidateRegexString); public const string VsLanguageBlock = nameof(VsLanguageBlock); public const string VsNavInfo = nameof(VsNavInfo); public const string XmlTagCompletion = nameof(XmlTagCompletion); diff --git a/src/EditorFeatures/VisualBasic/BraceMatching/StringLiteralBraceMatcher.vb b/src/EditorFeatures/VisualBasic/BraceMatching/StringLiteralBraceMatcher.vb index ca48cdaadd1..9bfbe3015f7 100644 --- a/src/EditorFeatures/VisualBasic/BraceMatching/StringLiteralBraceMatcher.vb +++ b/src/EditorFeatures/VisualBasic/BraceMatching/StringLiteralBraceMatcher.vb @@ -5,6 +5,7 @@ Imports System.Threading.Tasks Imports Microsoft.CodeAnalysis.Text Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.BraceMatching + Friend Class StringLiteralBraceMatcher Implements IBraceMatcher @@ -15,15 +16,14 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.BraceMatching Dim root = Await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(False) Dim token = root.FindToken(position) - If position = token.SpanStart OrElse position = token.Span.End - 1 Then - If token.Kind = SyntaxKind.StringLiteralToken AndAlso Not token.ContainsDiagnostics Then - Return New BraceMatchingResult( + If token.Kind = SyntaxKind.StringLiteralToken AndAlso Not token.ContainsDiagnostics Then + Return New BraceMatchingResult( New TextSpan(token.SpanStart, 1), New TextSpan(token.Span.End - 1, 1)) - End If End If Return Nothing End Function End Class + End Namespace diff --git a/src/EditorFeatures/VisualBasicTest/Classification/SemanticClassifierTests.vb b/src/EditorFeatures/VisualBasicTest/Classification/SemanticClassifierTests.vb index 67ffa598487..7a647c0e0da 100644 --- a/src/EditorFeatures/VisualBasicTest/Classification/SemanticClassifierTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Classification/SemanticClassifierTests.vb @@ -531,44 +531,6 @@ End Class" [Class]("AttributeUsage")) End Function - - Public Async Function TestRegex1() As Task - Await TestAsync( -" -imports System.Text.RegularExpressions - -class Program - sub Goo() - ' language=regex - var r = ""$(\b\G\z)|(?sub){0,5}?^"" - end sub -end class", -Regex.Anchor("$"), -Regex.Grouping("("), -Regex.Anchor("\"), -Regex.Anchor("b"), -Regex.Anchor("\"), -Regex.Anchor("G"), -Regex.Anchor("\"), -Regex.Anchor("z"), -Regex.Grouping(")"), -Regex.Alternation("|"), -Regex.Grouping("("), -Regex.Grouping("?"), -Regex.Grouping("<"), -Regex.Grouping("name"), -Regex.Grouping(">"), -Regex.Text("sub"), -Regex.Grouping(")"), -Regex.Quantifier("{"), -Regex.Quantifier("0"), -Regex.Quantifier(","), -Regex.Quantifier("5"), -Regex.Quantifier("}"), -Regex.Quantifier("?"), -Regex.Anchor("^")) - End Function - Public Async Function TestConstField() As Task Dim code = @@ -678,5 +640,6 @@ End Operator" Await TestInClassAsync(code) End Function + End Class End Namespace diff --git a/src/Features/Core/Portable/Diagnostics/Analyzers/IDEDiagnosticIds.cs b/src/Features/Core/Portable/Diagnostics/Analyzers/IDEDiagnosticIds.cs index 7b8bc6891d0..0439d77deb5 100644 --- a/src/Features/Core/Portable/Diagnostics/Analyzers/IDEDiagnosticIds.cs +++ b/src/Features/Core/Portable/Diagnostics/Analyzers/IDEDiagnosticIds.cs @@ -64,8 +64,6 @@ internal static class IDEDiagnosticIds public const string ValidateFormatStringDiagnosticID = "IDE0043"; - public const string RegexPatternDiagnosticId = "IDE0044"; - // Analyzer error Ids public const string AnalyzerChangedId = "IDE1001"; public const string AnalyzerDependencyConflictId = "IDE1002"; diff --git a/src/Features/Core/Portable/DocumentHighlighting/AbstractDocumentHighlightsService.cs b/src/Features/Core/Portable/DocumentHighlighting/AbstractDocumentHighlightsService.cs index 50b6477fcb5..d7d3b5506f3 100644 --- a/src/Features/Core/Portable/DocumentHighlighting/AbstractDocumentHighlightsService.cs +++ b/src/Features/Core/Portable/DocumentHighlighting/AbstractDocumentHighlightsService.cs @@ -8,6 +8,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis.ErrorReporting; +using Microsoft.CodeAnalysis.Experiments; using Microsoft.CodeAnalysis.FindSymbols; using Microsoft.CodeAnalysis.LanguageServices; using Microsoft.CodeAnalysis.PooledObjects; @@ -60,12 +61,6 @@ internal abstract partial class AbstractDocumentHighlightsService : IDocumentHig private async Task> GetDocumentHighlightsInCurrentProcessAsync( Document document, int position, IImmutableSet documentsToSearch, CancellationToken cancellationToken) { - var result = await TryGetRegexPatternHighlightsAsync(document, position, cancellationToken).ConfigureAwait(false); - if (!result.IsDefaultOrEmpty) - { - return result; - } - // use speculative semantic model to see whether we are on a symbol we can do HR var span = new TextSpan(position, 0); var solution = document.Project.Solution; @@ -320,7 +315,7 @@ private static async Task AddLocationSpan(Location location, Solution solution, var tree = location.SourceTree; var document = solution.GetDocument(tree); - var syntaxFacts = document.GetLanguageService(); + var syntaxFacts = document.Project.LanguageServices.GetService(); if (syntaxFacts != null) { diff --git a/src/Features/Core/Portable/FeaturesResources.Designer.cs b/src/Features/Core/Portable/FeaturesResources.Designer.cs index f446cabd3e5..a9dfa13555d 100644 --- a/src/Features/Core/Portable/FeaturesResources.Designer.cs +++ b/src/Features/Core/Portable/FeaturesResources.Designer.cs @@ -427,16 +427,18 @@ internal class FeaturesResources { return ResourceManager.GetString("Adding_an_imported_method_will_prevent_the_debug_session_from_continuing", resourceCulture); } } - + /// /// Looks up a localized string similar to Alias ambiguous type '{0}'. /// - internal static string Alias_ambiguous_type_0 { - get { + internal static string Alias_ambiguous_type_0 + { + get + { return ResourceManager.GetString("Alias_ambiguous_type_0", resourceCulture); } } - + /// /// Looks up a localized string similar to All lowercase. /// @@ -2544,15 +2546,6 @@ internal class FeaturesResources { } } - /// - /// Looks up a localized string similar to Regex issue: {0}. - /// - internal static string Regex_issue_0 { - get { - return ResourceManager.GetString("Regex_issue_0", resourceCulture); - } - } - /// /// Looks up a localized string similar to Remarks:. /// @@ -3653,6 +3646,15 @@ internal class FeaturesResources { } } + /// + /// Looks up a localized string similar to Variable declaration can be deconstructed. + /// + internal static string Variable_declaration_can_be_deconstructed { + get { + return ResourceManager.GetString("Variable_declaration_can_be_deconstructed", resourceCulture); + } + } + /// /// Looks up a localized string similar to Using readonly references will prevent the debug session from continuing.. /// @@ -3680,15 +3682,6 @@ internal class FeaturesResources { } } - /// - /// Looks up a localized string similar to Variable declaration can be deconstructed. - /// - internal static string Variable_declaration_can_be_deconstructed { - get { - return ResourceManager.GetString("Variable_declaration_can_be_deconstructed", resourceCulture); - } - } - /// /// Looks up a localized string similar to Variable declaration can be inlined. /// diff --git a/src/Features/Core/Portable/FeaturesResources.resx b/src/Features/Core/Portable/FeaturesResources.resx index 01e2cf3a448..e148e16dd49 100644 --- a/src/Features/Core/Portable/FeaturesResources.resx +++ b/src/Features/Core/Portable/FeaturesResources.resx @@ -1334,9 +1334,6 @@ This version used in: {2} indexer - - Regex issue: {0} - Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf index 82f1a0d81c6..e4f0368fe42 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf @@ -1985,11 +1985,6 @@ Tato verze se používá zde: {2}. indexer - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf index a21ba9f5f4f..b0a13cc7e17 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf @@ -1985,11 +1985,6 @@ Diese Version wird verwendet in: {2} Indexer - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf index 0c1d7a6a92b..53ec5395438 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf @@ -1985,11 +1985,6 @@ Esta versión se utiliza en: {2} indizador - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf index 2dcdaeca2f5..fb2d4683760 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf @@ -1985,11 +1985,6 @@ Version utilisée dans : {2} indexeur - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf index aee4f910f2f..aef086e36e5 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf @@ -1985,11 +1985,6 @@ Questa versione è usata {2} indicizzatore - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf index 6e1c1577588..ff90d419bae 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf @@ -1985,11 +1985,6 @@ This version used in: {2} インデクサー - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf index c93059a208b..40db56ff6ab 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf @@ -1985,11 +1985,6 @@ This version used in: {2} 인덱서 - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf index 0ac39fbb205..2ebc7240b1f 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf @@ -1985,11 +1985,6 @@ Ta wersja jest używana wersja: {2} indeksator - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf index 5690e1fec30..ea5a29f1b2f 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf @@ -1985,11 +1985,6 @@ Essa versão é usada no: {2} indexador - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf index 993d58eac07..c5a7810fbd7 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf @@ -1985,11 +1985,6 @@ This version used in: {2} индексатор - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf index 19b8ddf5322..f53efeed7f7 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf @@ -1985,11 +1985,6 @@ Bu sürüm şurada kullanılır: {2} dizin oluşturucu - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf index 94f32ad3cd9..cd3c016bbea 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf @@ -1985,11 +1985,6 @@ This version used in: {2} 索引器 - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf index edd93093c19..84a91253099 100644 --- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf +++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf @@ -1985,11 +1985,6 @@ This version used in: {2} 索引子 - - Regex issue: {0} - Regex issue: {0} - - Alias ambiguous type '{0}' Alias ambiguous type '{0}' diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml index 2065c8e4acd..477e217fbda 100644 --- a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml +++ b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml @@ -99,20 +99,7 @@ Content="{x:Static local:AdvancedOptionPageStrings.Option_Report_invalid_placeholders_in_string_dot_format_calls}" /> - - - - - - - - - - - CSharpVSResources.Report_invalid_placeholders_in_string_dot_format_calls; - - public static string Option_Regular_Expressions => - ServicesVSResources.Regular_Expressions; - - public static string Option_Colorize_regular_expressions => - ServicesVSResources.Colorize_regular_expressions; - - public static string Option_Report_invalid_regular_expressions => - ServicesVSResources.Report_invalid_regular_expressions; - - public static string Option_Highlight_related_components_under_cursor => - ServicesVSResources.Highlight_related_components_under_cursor; + CSharpVSResources.Report_invalid_placeholders_in_string_dot_format_calls; } } diff --git a/src/VisualStudio/Core/Def/HACK_ThemeColorFixer.cs b/src/VisualStudio/Core/Def/HACK_ThemeColorFixer.cs index 8f6ec606080..aa9f5fa9a52 100644 --- a/src/VisualStudio/Core/Def/HACK_ThemeColorFixer.cs +++ b/src/VisualStudio/Core/Def/HACK_ThemeColorFixer.cs @@ -75,15 +75,6 @@ public void RefreshThemeColors() UpdateForegroundColor(ClassificationTypeNames.XmlDocCommentComment, sourceFormatMap, targetFormatMap); UpdateForegroundColor(ClassificationTypeNames.XmlDocCommentCDataSection, sourceFormatMap, targetFormatMap); - UpdateForegroundColor(ClassificationTypeNames.RegexComment, sourceFormatMap, targetFormatMap); - UpdateForegroundColor(ClassificationTypeNames.RegexText, sourceFormatMap, targetFormatMap); - UpdateForegroundColor(ClassificationTypeNames.RegexCharacterClass, sourceFormatMap, targetFormatMap); - UpdateForegroundColor(ClassificationTypeNames.RegexQuantifier, sourceFormatMap, targetFormatMap); - UpdateForegroundColor(ClassificationTypeNames.RegexAnchor, sourceFormatMap, targetFormatMap); - UpdateForegroundColor(ClassificationTypeNames.RegexAlternation, sourceFormatMap, targetFormatMap); - UpdateForegroundColor(ClassificationTypeNames.RegexEscape, sourceFormatMap, targetFormatMap); - UpdateForegroundColor(ClassificationTypeNames.RegexGrouping, sourceFormatMap, targetFormatMap); - UpdateForegroundColor(ClassificationTypeNames.PreprocessorKeyword, sourceFormatMap, targetFormatMap); UpdateForegroundColor(ClassificationTypeNames.PreprocessorText, sourceFormatMap, targetFormatMap); diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs b/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs index d3d911adc28..f65885030f6 100644 --- a/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs +++ b/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs @@ -516,15 +516,6 @@ internal class ServicesVSResources { } } - /// - /// Looks up a localized string similar to Colorize regular expressions. - /// - internal static string Colorize_regular_expressions { - get { - return ResourceManager.GetString("Colorize_regular_expressions", resourceCulture); - } - } - /// /// Looks up a localized string similar to Computing remove suppressions fix.... /// @@ -1080,15 +1071,6 @@ internal class ServicesVSResources { } } - /// - /// Looks up a localized string similar to Highlight related components under cursor. - /// - internal static string Highlight_related_components_under_cursor { - get { - return ResourceManager.GetString("Highlight_related_components_under_cursor", resourceCulture); - } - } - /// /// Looks up a localized string similar to identifier. /// @@ -1989,15 +1971,6 @@ internal class ServicesVSResources { } } - /// - /// Looks up a localized string similar to Regular Expressions. - /// - internal static string Regular_Expressions { - get { - return ResourceManager.GetString("Regular_Expressions", resourceCulture); - } - } - /// /// Looks up a localized string similar to Remarks:. /// @@ -2070,15 +2043,6 @@ internal class ServicesVSResources { } } - /// - /// Looks up a localized string similar to Report invalid regular expressions. - /// - internal static string Report_invalid_regular_expressions { - get { - return ResourceManager.GetString("Report_invalid_regular_expressions", resourceCulture); - } - } - /// /// Looks up a localized string similar to Required Prefix:. /// diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx index a549884fb30..2911ba4edb9 100644 --- a/src/VisualStudio/Core/Def/ServicesVSResources.resx +++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx @@ -1009,18 +1009,6 @@ I agree to all of the foregoing: Decompiler Legal Notice - - Colorize regular expressions - - - Highlight related components under cursor - - - Regular Expressions - - - Report invalid regular expressions - Disabling the extension '{0}' unbound your keyboard bindings. 0 is an extension name diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf index b588214ae18..362c4ba3b43 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf @@ -1488,26 +1488,6 @@ Souhlasím se všemi výše uvedenými podmínkami: Právní doložka pro dekompilátor - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. Zakázání rozšíření {0} uvolnilo klávesové zkratky. diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf index ed4ff247c1f..a627b5de32f 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf @@ -1488,26 +1488,6 @@ Ich stimme allen vorstehenden Bedingungen zu: Rechtlicher Hinweis zum Decompiler - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. Durch das Deaktivieren der Erweiterung "{0}" wurden die Tastaturbindungen aufgehoben. diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf index 5c0361e1712..c274c0ecf33 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf @@ -1488,26 +1488,6 @@ Estoy de acuerdo con todo lo anterior: Aviso legal del Descompilador - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. La deshabilitación de la extensión "{0}" quitará los enlaces de teclado. diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf index 5d9240fb41f..d750e52fe09 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf @@ -1488,26 +1488,6 @@ Je suis d'accord avec tout ce qui précède : Décompileur - Mention légale - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. La désactivation de l'extension '{0}' a annulé la liaison de vos combinaisons de touches. diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf index c76e2b7acdc..fa35c63d638 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf @@ -1488,26 +1488,6 @@ L'utente accetta le condizioni sopra riportate: Note legali sul decompilatore - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. In seguito alla disabilitazione dell'estensione '{0}' i binding di tastiera sono stati annullati. diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf index 71af79e6cfa..5be7600dab7 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf @@ -1488,26 +1488,6 @@ I agree to all of the foregoing: デコンパイラの法的通知 - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. 拡張 '{0}' を無効にすることにより、キーボードのバインディングがバインド解除されました。 diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf index cf92a71f45e..bd5a7be468b 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf @@ -1488,26 +1488,6 @@ I agree to all of the foregoing: 디컴파일러 법적 고지 사항 - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. 키보드 바인딩을 바인딩 해제하는 '{0}' 확장을 사용하지 않도록 설정하는 중입니다. diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf index 19229f4041a..9dc9b39f09e 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf @@ -1488,26 +1488,6 @@ Wyrażam zgodę na wszystkie następujące postanowienia: Informacje prawne dotyczące Dekompilatora - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. Wyłączenie rozszerzenia „{0}” spowodowało usunięcie powiązań klawiaturowych. diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf index 9383396c0b2..7bfff85155d 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf @@ -1488,26 +1488,6 @@ Eu concordo com todo o conteúdo supracitado: Aviso Legal do Descompilador - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. A desabilitação da extensão '{0}' desvinculou as associações do teclado. diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf index 8ad967261a7..165e713a6b0 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf @@ -1488,26 +1488,6 @@ I agree to all of the foregoing: Юридическая информация для декомпилятора - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. Отключение расширения "{0}" удалит привязки клавиш. diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf index dcfacc20b5f..284081c70dc 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf @@ -1488,26 +1488,6 @@ Aşağıdakilerin tümünü onaylıyorum: Derleme Ayırıcı Yasal Bildirim - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. '{0}' uzantısının devre dışı bırakılması klavye bağlamalarınızı bozdu. diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf index 7781adb69ba..ac0e908d842 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf @@ -1488,26 +1488,6 @@ I agree to all of the foregoing: Decompiler 法律声明 - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. 禁用扩展“{0}”，取消绑定键盘绑定。 diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf index dc28a663c3b..c28218d6b93 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf @@ -1488,26 +1488,6 @@ I agree to all of the foregoing: 解編程式的法律聲明 - - Colorize regular expressions - Colorize regular expressions - - - - Highlight related components under cursor - Highlight related components under cursor - - - - Regular Expressions - Regular Expressions - - - - Report invalid regular expressions - Report invalid regular expressions - - Disabling the extension '{0}' unbound your keyboard bindings. 禁止延伸模組 '{0}' 解除您的鍵盤繫結關係。 diff --git a/src/VisualStudio/VisualBasic/Impl/BasicVSResources.resx b/src/VisualStudio/VisualBasic/Impl/BasicVSResources.resx index 980369aec30..691689cae36 100644 --- a/src/VisualStudio/VisualBasic/Impl/BasicVSResources.resx +++ b/src/VisualStudio/VisualBasic/Impl/BasicVSResources.resx @@ -273,10 +273,10 @@ Prefer 'Is Nothing' over 'Object.ReferenceEquals(..., Nothing)' - - Separate import directive groups - Report invalid placeholders in 'String.Format' calls + + Separate import directive groups + \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml index c921eb9b0fa..af82357aa83 100644 --- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml +++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml @@ -105,19 +105,6 @@ Content="{x:Static local:AdvancedOptionPageStrings.Option_NavigateToObjectBrowser}" /> - - - - - - - - - diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb index f716028e9c5..4ad2053268e 100644 --- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb +++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb @@ -6,7 +6,6 @@ Imports Microsoft.CodeAnalysis.Editor.Shared.Options Imports Microsoft.CodeAnalysis.ExtractMethod Imports Microsoft.CodeAnalysis.Fading Imports Microsoft.CodeAnalysis.ImplementType -Imports Microsoft.CodeAnalysis.RegularExpressions Imports Microsoft.CodeAnalysis.Remote Imports Microsoft.CodeAnalysis.Structure Imports Microsoft.CodeAnalysis.SymbolSearch @@ -59,10 +58,6 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options BindToOption(prefer_auto_properties, ImplementTypeOptions.PropertyGenerationBehavior, ImplementTypePropertyGenerationBehavior.PreferAutoProperties, LanguageNames.VisualBasic) BindToOption(Report_invalid_placeholders_in_string_dot_format_calls, ValidateFormatStringOption.ReportInvalidPlaceholdersInStringDotFormatCalls, LanguageNames.VisualBasic) - - BindToOption(Colorize_regular_expressions, RegularExpressionsOptions.ColorizeRegexPatterns, LanguageNames.VisualBasic) - BindToOption(Report_invalid_regular_expressions, RegularExpressionsOptions.ReportInvalidRegexPatterns, LanguageNames.VisualBasic) - BindToOption(Highlight_related_components_under_cursor, RegularExpressionsOptions.HighlightRelatedRegexComponentsUnderCursor, LanguageNames.VisualBasic) End Sub End Class End Namespace diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb index 2a0ca8fbdc9..d3cefdac286 100644 --- a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb +++ b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageStrings.vb @@ -200,22 +200,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options Public ReadOnly Property Option_SeparateImportGroups As String = BasicVSResources.Separate_import_directive_groups - Public ReadOnly Property Option_Suggest_imports_for_types_in_reference_assemblies As String = - BasicVSResources.Suggest_imports_for_types_in_reference_assemblies - - Public ReadOnly Property Option_Suggest_imports_for_types_in_NuGet_packages As String = - BasicVSResources.Suggest_imports_for_types_in_NuGet_packages - - Public ReadOnly Property Option_Regular_Expressions As String = - ServicesVSResources.Regular_Expressions - - Public ReadOnly Property Option_Colorize_regular_expressions As String = - ServicesVSResources.Colorize_regular_expressions - - Public ReadOnly Property Option_Report_invalid_regular_expressions As String = - ServicesVSResources.Report_invalid_regular_expressions + Public ReadOnly Property Option_Suggest_imports_for_types_in_reference_assemblies As String + Get + Return BasicVSResources.Suggest_imports_for_types_in_reference_assemblies + End Get + End Property - Public ReadOnly Property Option_Highlight_related_components_under_cursor As String = - ServicesVSResources.Highlight_related_components_under_cursor + Public ReadOnly Property Option_Suggest_imports_for_types_in_NuGet_packages As String + Get + Return BasicVSResources.Suggest_imports_for_types_in_NuGet_packages + End Get + End Property End Module End Namespace diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.cs.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.cs.xlf index 203a101ae8a..4009dd73492 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.cs.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.cs.xlf @@ -262,16 +262,16 @@ Preferovat „Is Nothing“ před „Object.ReferenceEquals(..., Nothing)“ + + Report invalid placeholders in 'String.Format' calls + Oznamovat neplatné zástupné symboly ve voláních „String.Format“ + + Separate import directive groups Oddělovat skupiny direktiv import - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.de.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.de.xlf index fd986066306..dfaa6335895 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.de.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.de.xlf @@ -262,16 +262,16 @@ "Is Nothing" gegenüber "Object.ReferenceEquals(..., Nothing)" bevorzugen + + Report invalid placeholders in 'String.Format' calls + Ungültige Platzhalter in String.Format-Aufrufen melden + + Separate import directive groups Import-Anweisungsgruppen trennen - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.es.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.es.xlf index 5f496d7809b..78e3c92cbed 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.es.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.es.xlf @@ -262,16 +262,16 @@ Preferir "Is Nothing" a "Object.ReferenceEquals(..., Nothing)" + + Report invalid placeholders in 'String.Format' calls + Informar sobre marcadores de posición no válidos en llamadas a "String.Format" + + Separate import directive groups Separar grupos de directivas import - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.fr.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.fr.xlf index 60b550c9484..cd2b993602b 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.fr.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.fr.xlf @@ -262,16 +262,16 @@ Préférer 'Is Nothing' à 'Object.ReferenceEquals(..., Nothing)' + + Report invalid placeholders in 'String.Format' calls + Signaler les espaces réservés non valides dans les appels de 'String.Format' + + Separate import directive groups Séparer les groupes de directives import - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.it.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.it.xlf index fa8ccae6fe6..855d7d2a5cc 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.it.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.it.xlf @@ -262,16 +262,16 @@ Preferisci 'Is Nothing' a 'Object.ReferenceEquals(..., Nothing)' + + Report invalid placeholders in 'String.Format' calls + Segnala segnaposto non validi in chiamate 'String.Format' + + Separate import directive groups Separa gruppi di direttive import - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ja.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ja.xlf index 40772ada2df..98cc7f8a418 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ja.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ja.xlf @@ -262,16 +262,16 @@ Object.ReferenceEquals(..., Nothing)' より 'Is Nothing' を優先します + + Report invalid placeholders in 'String.Format' calls + String.Format' の呼び出しで無効なプレース ホルダーをレポートします + + Separate import directive groups インポート ディレクティブのグループを分離します - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ko.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ko.xlf index d49d3348b09..e9c6a50ddd1 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ko.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ko.xlf @@ -262,16 +262,16 @@ Object.ReferenceEquals(..., Nothing)'보다 'Is Nothing' 선호 + + Report invalid placeholders in 'String.Format' calls + String.Format' 호출에서 잘못된 자리 표시자 보고 + + Separate import directive groups import 지시문 그룹 구분 - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pl.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pl.xlf index 8e3ff671320..b60c9dc99cf 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pl.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pl.xlf @@ -262,16 +262,16 @@ Preferuj „Is Nothing” zamiast „Object.ReferenceEquals(..., Nothing)” + + Report invalid placeholders in 'String.Format' calls + Zgłaszaj nieprawidłowe symbole zastępcze w wywołaniach metody „String.Format” + + Separate import directive groups Oddziel grupy dyrektywy import - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pt-BR.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pt-BR.xlf index d4608cef5ec..4241e064a60 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pt-BR.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.pt-BR.xlf @@ -262,16 +262,16 @@ Prefira usar 'Is Nothing' em vez de ' Object.ReferenceEquals(..., Nothing)' + + Report invalid placeholders in 'String.Format' calls + Relatar espaços reservados inválidos em chamadas 'String.Format' + + Separate import directive groups Separar grupos de diretiva de importação - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ru.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ru.xlf index 4596dbd7bd2..e47bbfb6de6 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ru.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.ru.xlf @@ -262,16 +262,16 @@ Предпочитать "Is Nothing" методу "Object.ReferenceEquals(..., Nothing)" + + Report invalid placeholders in 'String.Format' calls + Сообщать о недопустимых заполнителях в вызовах "String.Format" + + Separate import directive groups Разделять группы директив import - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.tr.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.tr.xlf index 7a78e121ffa..6ea25c76f81 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.tr.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.tr.xlf @@ -262,16 +262,16 @@ Object.ReferenceEquals(..., Nothing)' yerine 'Is Nothing' tercih et + + Report invalid placeholders in 'String.Format' calls + String.Format' çağrılarındaki geçersiz yer tutucuları bildir + + Separate import directive groups İçeri aktarma yönerge gruplarını ayır - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hans.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hans.xlf index 9d753a207cb..142fd1a27ab 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hans.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hans.xlf @@ -262,16 +262,16 @@ 首选 "Is Nothing" 而非 "Object.ReferenceEquals(..., Nothing)" + + Report invalid placeholders in 'String.Format' calls + 报告 "String.Format" 调用中无效的占位符 + + Separate import directive groups 单独的导入指令组 - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file diff --git a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hant.xlf b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hant.xlf index 83377cfacf3..bf42c119b12 100644 --- a/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hant.xlf +++ b/src/VisualStudio/VisualBasic/Impl/xlf/BasicVSResources.zh-Hant.xlf @@ -262,16 +262,16 @@ 使用 'Is Nothing' 優先於 'Object.ReferenceEquals(..., Nothing)' + + Report invalid placeholders in 'String.Format' calls + 報告 'String.Format' 呼叫中無效的預留位置 + + Separate import directive groups 分隔匯入指示詞群組 - - Report invalid placeholders in 'String.Format' calls - Report invalid placeholders in 'String.Format' calls - - \ No newline at end of file -- GitLab