Skip to content

Commit

Permalink
remove dupe string
Browse files Browse the repository at this point in the history
  • Loading branch information
@CyrusNajmabadi
CyrusNajmabadi committed Nov 29, 2024
1 parent ad5652c commit dfc660c
Show file tree
Hide file tree
Showing 65 changed files with 1,757 additions and 3,472 deletions.
75 changes: 0 additions & 75 deletions src/VisualStudio/CSharp/Impl/CSharpVSResources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,6 @@
<data name="Surround_With" xml:space="preserve">
<value>Surround With</value>
</data>
<data name="Insert_Snippet" xml:space="preserve">
<value>Insert Snippet</value>
</data>
<data name="Automatically_format_block_on_close_brace" xml:space="preserve">
<value>Automatically format _block on }</value>
</data>
Expand Down Expand Up @@ -313,54 +310,21 @@
<data name="New_line_options_for_keywords" xml:space="preserve">
<value>New line options for keywords</value>
</data>
<data name="Show_procedure_line_separators" xml:space="preserve">
<value>_Show procedure line separators</value>
</data>
<data name="Editor_Help" xml:space="preserve">
<value>Editor Help</value>
</data>
<data name="Highlight_related_keywords_under_cursor" xml:space="preserve">
<value>Highlight related _keywords under cursor</value>
</data>
<data name="Highlight_references_to_symbol_under_cursor" xml:space="preserve">
<value>_Highlight references to symbol under cursor</value>
</data>
<data name="Enter_outlining_mode_when_files_open" xml:space="preserve">
<value>Enter _outlining mode when files open</value>
</data>
<data name="Generate_XML_documentation_comments_for" xml:space="preserve">
<value>_Generate XML documentation comments for ///</value>
</data>
<data name="Highlighting" xml:space="preserve">
<value>Highlighting</value>
</data>
<data name="Insert_at_the_start_of_new_lines_when_writing_comments" xml:space="preserve">
<value>_Insert * at the start of new lines when writing /* */ comments</value>
</data>
<data name="Optimize_for_solution_size" xml:space="preserve">
<value>Optimize for solution size</value>
</data>
<data name="Large" xml:space="preserve">
<value>Large</value>
</data>
<data name="Regular" xml:space="preserve">
<value>Regular</value>
</data>
<data name="Small" xml:space="preserve">
<value>Small</value>
</data>
<data name="Using_Directives" xml:space="preserve">
<value>Using Directives</value>
</data>
<data name="Performance" xml:space="preserve">
<value>Performance</value>
</data>
<data name="Place_System_directives_first_when_sorting_usings" xml:space="preserve">
<value>_Place 'System' directives first when sorting usings</value>
</data>
<data name="Show_completion_list_after_a_character_is_typed" xml:space="preserve">
<value>_Show completion list after a character is typed</value>
</data>
<data name="Place_keywords_in_completion_lists" xml:space="preserve">
<value>Place _keywords in completion lists</value>
</data>
Expand All @@ -373,9 +337,6 @@
<data name="Selection_In_Completion_List" xml:space="preserve">
<value>Selection In Completion List</value>
</data>
<data name="Show_preview_for_rename_tracking" xml:space="preserve">
<value>Show preview for rename _tracking</value>
</data>
<data name="Place_open_brace_on_new_line_for_property_indexer_and_event_accessors" xml:space="preserve">
<value>Place open brace on new line for property, indexer, and event accessors</value>
</data>
Expand Down Expand Up @@ -433,39 +394,12 @@
<data name="Split_string_literals_on_enter" xml:space="preserve">
<value>Split string literals on _enter</value>
</data>
<data name="Highlight_matching_portions_of_completion_list_items" xml:space="preserve">
<value>_Highlight matching portions of completion list items</value>
</data>
<data name="Show_completion_item_filters" xml:space="preserve">
<value>Show completion item _filters</value>
</data>
<data name="Enter_key_behavior_colon" xml:space="preserve">
<value>Enter key behavior:</value>
</data>
<data name="Only_add_new_line_on_enter_after_end_of_fully_typed_word" xml:space="preserve">
<value>_Only add new line on enter after end of fully typed word</value>
</data>
<data name="Always_add_new_line_on_enter" xml:space="preserve">
<value>_Always add new line on enter</value>
</data>
<data name="Never_add_new_line_on_enter" xml:space="preserve">
<value>_Never add new line on enter</value>
</data>
<data name="Always_include_snippets" xml:space="preserve">
<value>Always include snippets</value>
</data>
<data name="Include_snippets_when_Tab_is_typed_after_an_identifier" xml:space="preserve">
<value>Include snippets when ?-Tab is typed after an identifier</value>
</data>
<data name="Never_include_snippets" xml:space="preserve">
<value>Never include snippets</value>
</data>
<data name="Snippets_behavior" xml:space="preserve">
<value>Snippets behavior</value>
</data>
<data name="Show_completion_list_after_a_character_is_deleted" xml:space="preserve">
<value>Show completion list after a character is _deleted</value>
</data>
<data name="null_checking_colon" xml:space="preserve">
<value>'null' checking:</value>
</data>
Expand Down Expand Up @@ -525,15 +459,9 @@
<data name="Discard" xml:space="preserve">
<value>Discard</value>
</data>
<data name="Unused_local" xml:space="preserve">
<value>Unused local</value>
</data>
<data name="When_on_multiple_lines" xml:space="preserve">
<value>When on multiple lines</value>
</data>
<data name="Show_items_from_unimported_namespaces" xml:space="preserve">
<value>Show items from unimported namespaces</value>
</data>
<data name="Inside_namespace" xml:space="preserve">
<value>Inside namespace</value>
<comment>'namespace' is a C# keyword and should not be localized</comment>
Expand All @@ -556,9 +484,6 @@
<data name="Automatically_show_completion_list_in_argument_lists" xml:space="preserve">
<value>Automatically show completion list in argument lists</value>
</data>
<data name="Show_remarks_in_Quick_Info" xml:space="preserve">
<value>Show remarks in Quick Info</value>
</data>
<data name="Pattern_matching_preferences_colon" xml:space="preserve">
<value>Pattern matching preferences:</value>
</data>
Expand Down
2 changes: 1 addition & 1 deletion ...Sharp/Impl/EditorConfigSettings/DataProvider/CodeStyle/CSharpCodeStyleSettingsProvider.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ private static IEnumerable<CodeStyleSetting> GetExpressionBodyCodeStyleOptions(T
private static IEnumerable<CodeStyleSetting> GetUnusedValueCodeStyleOptions(TieredAnalyzerConfigOptions options, OptionUpdater updater)
{
var enumValues = new[] { UnusedValuePreference.UnusedLocalVariable, UnusedValuePreference.DiscardVariable };
var valueDescriptions = new[] { CSharpVSResources.Unused_local, CSharpVSResources.Discard };
var valueDescriptions = new[] { ServicesVSResources.Unused_local, CSharpVSResources.Discard };

yield return CodeStyleSetting.Create(CSharpCodeStyleOptions.UnusedValueAssignment, ServicesVSResources.Avoid_unused_value_assignments, options, updater, enumValues, valueDescriptions);
yield return CodeStyleSetting.Create(CSharpCodeStyleOptions.UnusedValueExpressionStatement, ServicesVSResources.Avoid_expression_statements_that_implicitly_ignore_value, options, updater, enumValues, valueDescriptions);
Expand Down
24 changes: 12 additions & 12 deletions src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageStrings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ public static string Option_on_the_right_edge_of_the_editor_window
=> ServicesVSResources.on_the_right_edge_of_the_editor_window;

public static string Option_RenameTrackingPreview
=> CSharpVSResources.Show_preview_for_rename_tracking;
=> ServicesVSResources.Show_preview_for_rename_tracking;

public static string Option_Split_string_literals_on_enter
=> CSharpVSResources.Split_string_literals_on_enter;

public static string Option_DisplayLineSeparators
=> CSharpVSResources.Show_procedure_line_separators;
=> ServicesVSResources.Show_procedure_line_separators;

public static string Option_Underline_reassigned_variables
=> ServicesVSResources.Underline_reassigned_variables;
Expand All @@ -155,13 +155,13 @@ public static string Option_Strike_out_obsolete_symbols
=> ServicesVSResources.Strike_out_obsolete_symbols;

public static string Option_EditorHelp
=> CSharpVSResources.Editor_Help;
=> ServicesVSResources.Editor_Help;

public static string Option_EnableHighlightKeywords
=> CSharpVSResources.Highlight_related_keywords_under_cursor;
=> ServicesVSResources.Highlight_related_keywords_under_cursor;

public static string Option_EnableHighlightReferences
=> CSharpVSResources.Highlight_references_to_symbol_under_cursor;
=> ServicesVSResources.Highlight_references_to_symbol_under_cursor;

public static string Option_EnterOutliningMode
=> CSharpVSResources.Enter_outlining_mode_when_files_open;
Expand Down Expand Up @@ -200,22 +200,22 @@ public static string Option_InsertAsteriskAtTheStartOfNewLinesWhenWritingBlockCo
=> CSharpVSResources.Insert_at_the_start_of_new_lines_when_writing_comments;

public static string Option_ShowRemarksInQuickInfo
=> CSharpVSResources.Show_remarks_in_Quick_Info;
=> ServicesVSResources.Show_remarks_in_Quick_Info;

public static string Option_Highlighting
=> CSharpVSResources.Highlighting;
=> ServicesVSResources.Highlighting;

public static string Option_OptimizeForSolutionSize
=> CSharpVSResources.Optimize_for_solution_size;
=> ServicesVSResources.Optimize_for_solution_size;

public static string Option_OptimizeForSolutionSize_Large
=> CSharpVSResources.Large;
=> ServicesVSResources.Large;

public static string Option_OptimizeForSolutionSize_Regular
=> CSharpVSResources.Regular;
=> ServicesVSResources.Regular;

public static string Option_OptimizeForSolutionSize_Small
=> CSharpVSResources.Small;
=> ServicesVSResources.Small;

public static string Option_Quick_Actions
=> ServicesVSResources.Quick_Actions;
Expand Down Expand Up @@ -272,7 +272,7 @@ public static string Option_Fade_out_unreachable_code
=> ServicesVSResources.Fade_out_unreachable_code;

public static string Option_Performance
=> CSharpVSResources.Performance;
=> ServicesVSResources.Performance;

public static string Option_PlaceSystemNamespaceFirst
=> CSharpVSResources.Place_System_directives_first_when_sorting_usings;
Expand Down
2 changes: 1 addition & 1 deletion src/VisualStudio/CSharp/Impl/Options/Formatting/StyleViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2457,7 +2457,7 @@ private void AddUnusedValueOptions(OptionStore optionStore, string expressionPre
{
var unusedValuePreferences = new List<CodeStylePreference>
{
new CodeStylePreference(CSharpVSResources.Unused_local, isChecked: false),
new CodeStylePreference(ServicesVSResources.Unused_local, isChecked: false),
new CodeStylePreference(CSharpVSResources.Discard, isChecked: true),
};

Expand Down
22 changes: 11 additions & 11 deletions src/VisualStudio/CSharp/Impl/Options/IntelliSenseOptionPageStrings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ namespace Microsoft.VisualStudio.LanguageServices.CSharp.Options
internal static class IntelliSenseOptionPageStrings
{
public static string Option_Show_completion_list_after_a_character_is_typed
=> CSharpVSResources.Show_completion_list_after_a_character_is_typed;
=> ServicesVSResources.Show_completion_list_after_a_character_is_typed;

public static string Option_Show_completion_list_after_a_character_is_deleted
=> CSharpVSResources.Show_completion_list_after_a_character_is_deleted;
=> ServicesVSResources.Show_completion_list_after_a_character_is_deleted;

public static string Option_Completion
{
Expand All @@ -35,30 +35,30 @@ public static string Option_ShowSnippets
}

public static string Option_Highlight_matching_portions_of_completion_list_items
=> CSharpVSResources.Highlight_matching_portions_of_completion_list_items;
=> ServicesVSResources.Highlight_matching_portions_of_completion_list_items;

public static string Option_Show_completion_item_filters
=> CSharpVSResources.Show_completion_item_filters;
=> ServicesVSResources.Show_completion_item_filters;

public static string Option_Automatically_complete_statement_on_semicolon => CSharpVSResources.Automatically_complete_statement_on_semicolon;

public static string Enter_key_behavior_Title
=> CSharpVSResources.Enter_key_behavior_colon;
=> ServicesVSResources.Enter_key_behavior_colon;

public static string Option_Never_add_new_line_on_enter
=> CSharpVSResources.Never_add_new_line_on_enter;
=> ServicesVSResources.Never_add_new_line_on_enter;

public static string Option_Only_add_new_line_on_enter_with_whole_word
=> CSharpVSResources.Only_add_new_line_on_enter_after_end_of_fully_typed_word;
=> ServicesVSResources.Only_add_new_line_on_enter_after_end_of_fully_typed_word;

public static string Option_Always_add_new_line_on_enter
=> CSharpVSResources.Always_add_new_line_on_enter;
=> ServicesVSResources.Always_add_new_line_on_enter;

public static string Snippets_behavior
=> CSharpVSResources.Snippets_behavior;
=> ServicesVSResources.Snippets_behavior;

public static string Option_Never_include_snippets
=> CSharpVSResources.Never_include_snippets;
=> ServicesVSResources.Never_include_snippets;

public static string Option_Always_include_snippets
=> CSharpVSResources.Always_include_snippets;
Expand All @@ -70,7 +70,7 @@ public static string Option_Show_name_suggestions
=> CSharpVSResources.Show_name_suggestions;

public static string Option_Show_items_from_unimported_namespaces
=> CSharpVSResources.Show_items_from_unimported_namespaces;
=> ServicesVSResources.Show_items_from_unimported_namespaces;

public static string Option_Tab_twice_to_insert_arguments
=> ServicesVSResources.Tab_twice_to_insert_arguments;
Expand Down
2 changes: 1 addition & 1 deletion src/VisualStudio/CSharp/Impl/Snippets/SnippetCommandHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ protected override bool TryInvokeInsertionUI(ITextView textView, ITextBuffer sub
bstrKinds: null,
iCountKinds: 0,
fIncludeNULLKind: 0,
bstrPrefixText: surroundWith ? CSharpVSResources.Surround_With : CSharpVSResources.Insert_Snippet,
bstrPrefixText: surroundWith ? CSharpVSResources.Surround_With : ServicesVSResources.Insert_Snippet,
bstrCompletionChar: null);

return true;
Expand Down
3 changes: 0 additions & 3 deletions src/VisualStudio/CSharp/Impl/VSPackage.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,4 @@ Show items from unimported namespaces (experimental);</value>
<data name="Never_include_snippets" xml:space="preserve">
<value>Never include snippets</value>
</data>
<data name="Only_add_new_line_on_enter_after_end_of_fully_typed_word" xml:space="preserve">
<value>Only add new line on enter after end of fully typed word</value>
</data>
</root>
Loading

0 comments on commit dfc660c

Please sign in to comment.