diff --git a/src/Features/CSharp/Portable/ConvertLinq/ConvertForEachToLinqQuery/AbstractConverter.cs b/src/Features/CSharp/Portable/ConvertLinq/ConvertForEachToLinqQuery/AbstractConverter.cs
index faebb26eed2fbcbde840a020bd189ca87c28870b..38df84f6962206c5dcf98f2d0b5f474d6d7e25a5 100644
--- a/src/Features/CSharp/Portable/ConvertLinq/ConvertForEachToLinqQuery/AbstractConverter.cs
+++ b/src/Features/CSharp/Portable/ConvertLinq/ConvertForEachToLinqQuery/AbstractConverter.cs
@@ -184,7 +184,7 @@ private static QueryClauseSyntax CreateQueryClause(ExtendedSyntaxNode node)
// OR
// c1.SelectMany(n1 => ...
//
- var invokedMethodName = !hasForEachChild ? "Select" : "SelectMany";
+ var invokedMethodName = !hasForEachChild ? nameof(Enumerable.Select) : nameof(Enumerable.SelectMany);
return SyntaxFactory.InvocationExpression(
SyntaxFactory.MemberAccessExpression(
SyntaxKind.SimpleMemberAccessExpression,
@@ -265,7 +265,7 @@ private static QueryClauseSyntax CreateQueryClause(ExtendedSyntaxNode node)
SyntaxFactory.MemberAccessExpression(
SyntaxKind.SimpleMemberAccessExpression,
receiver.Parenthesize(),
- SyntaxFactory.IdentifierName("Where")),
+ SyntaxFactory.IdentifierName(nameof(Enumerable.Where))),
SyntaxFactory.ArgumentList(SyntaxFactory.SingletonSeparatedList(
SyntaxFactory.Argument(lambda))));
diff --git a/src/Features/Core/Portable/ConvertLinq/ConvertForEachToLinqQuery/AbstractConvertForEachToLinqQueryProvider.cs b/src/Features/Core/Portable/ConvertLinq/ConvertForEachToLinqQuery/AbstractConvertForEachToLinqQueryProvider.cs
index 8014bda9fb7547ac8b630f5f5cbea8ccf4119959..341d87a82e9afd37367e5c60202a2dd6b34638b4 100644
--- a/src/Features/Core/Portable/ConvertLinq/ConvertForEachToLinqQuery/AbstractConvertForEachToLinqQueryProvider.cs
+++ b/src/Features/Core/Portable/ConvertLinq/ConvertForEachToLinqQuery/AbstractConvertForEachToLinqQueryProvider.cs
@@ -95,7 +95,7 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
return;
}
- // Offer refactoring to convert foreach to query expression. For example:
+ // Offer refactoring to convert foreach to LINQ query expression. For example:
//
// INPUT:
// foreach (var n1 in c1)
@@ -111,10 +111,10 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
//
context.RegisterRefactoring(
new ForEachToLinqQueryCodeAction(
- FeaturesResources.Convert_to_query,
+ FeaturesResources.Convert_to_linq,
c => ApplyConversion(queryConverter, document, convertToQuery: true, c)));
- // Offer refactoring to convert foreach to linq invocation expression. For example:
+ // Offer refactoring to convert foreach to LINQ invocation expression. For example:
//
// INPUT:
// foreach (var n1 in c1)
@@ -132,7 +132,7 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
{
context.RegisterRefactoring(
new ForEachToLinqQueryCodeAction(
- FeaturesResources.Convert_to_linq,
+ FeaturesResources.Convert_to_linq_call_form,
c => ApplyConversion(linqConverter, document, convertToQuery: false, c)));
}
}
diff --git a/src/Features/Core/Portable/FeaturesResources.Designer.cs b/src/Features/Core/Portable/FeaturesResources.Designer.cs
index 02ea877d2f6760a8253ef6ecc71f8ca7ba885514..2eb7b4a5f4359665380707fac99fad3d1ac5c906 100644
--- a/src/Features/Core/Portable/FeaturesResources.Designer.cs
+++ b/src/Features/Core/Portable/FeaturesResources.Designer.cs
@@ -934,7 +934,7 @@ internal class FeaturesResources {
}
///
- /// Looks up a localized string similar to Convert to linq.
+ /// Looks up a localized string similar to Convert to LINQ.
///
internal static string Convert_to_linq {
get {
@@ -943,11 +943,11 @@ internal class FeaturesResources {
}
///
- /// Looks up a localized string similar to Convert to query.
+ /// Looks up a localized string similar to Convert to LINQ (call form).
///
- internal static string Convert_to_query {
+ internal static string Convert_to_linq_call_form {
get {
- return ResourceManager.GetString("Convert_to_query", resourceCulture);
+ return ResourceManager.GetString("Convert_to_linq_call_form", resourceCulture);
}
}
diff --git a/src/Features/Core/Portable/FeaturesResources.resx b/src/Features/Core/Portable/FeaturesResources.resx
index 9e6dcf628c395b8b1c308735d88a96e453aadb8d..507d1372c6a4b5e12724a6cb70e476c43c4e75fb 100644
--- a/src/Features/Core/Portable/FeaturesResources.resx
+++ b/src/Features/Core/Portable/FeaturesResources.resx
@@ -1376,8 +1376,8 @@ This version used in: {2}
Convert to conditional expression
-
- Convert to query
+
+ Convert to LINQ
Convert to tuple
@@ -1403,7 +1403,7 @@ This version used in: {2}
Formatting document
-
- Convert to linq
+
+ Convert to LINQ (call form)
\ No newline at end of file
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
index f2dc8d1a3f5e5a26b699107fb6b3e402ef4e9f90..9b75e1198e2e69685ecdfc865851f58b73efbad8 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
index ba26071d9cedd4a22cfe66cf6e177b136881ac32..ae08cc19ac229972b35134b3f63bcb7e931b7a32 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
index a36461e53402ee5db4205487518db183bad3c2bb..576d2d5ed831b3ee04e8b4eafed9aa124aab2e79 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
index 23a09d08f303f96d88e49fce880a6751520a746b..3a37e1bbeb09861c4ea5f0c0824eec56b73ea383 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
index 7297094680c231a6e7af5a77113556e449e138de..e11fa7eda6e5d6bc63f54bc4f4e6e589eb892cfe 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
index 6ba85e16d9df3b9f746412ed17b292a8ae1af8c9..3b5bae33347492a71c07a20213ec51e31fde9a0e 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
index 615ef383d7c490c2586e0f564f7afaa34f44cb53..5c486cc6349f24de52921956d4b949c4ce871442 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
index a890f21c08b5ed16f84d10a8a2d0156be0d429b2..38e335bf8bb76381691b828cf78ec619197f44eb 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
index fd56b2fc75552d80aa473f3b0214d0f8b901f351..8f462dd0a7a5a2064a9a063a75daeb7cd2ac4eca 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
index faff7c5b57fcccba31395127ce77c0c51a4d2b6e..77e1e614615b57c92989c892e209ca8a30afafb8 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
index 8136e24caaf29611921d0657e41b59369e943a71..34fa6b96e19b4861e489f415d0be19e9a54063b3 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
index 2027222db3d89c6019dafde0d396db3bf79e9f55..6a1a41ae425647cc53af434f66b1cbddef7a18df 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
index 58f71c7733774ce4b3bb833e1b65357dffd6c02a..de13e90df33110ab7d3119e2f29d84356a34360d 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
@@ -23,13 +23,8 @@
-
- Convert to linq
-
-
-
-
- Convert to query
+
+ Convert to LINQ
@@ -42,6 +37,11 @@
Convert to class
+
+
+ Convert to LINQ (call form)
+
+
Convert to struct