Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
ef72156
Add empty json file
Cosifne Jan 19, 2024
b938ebe
Add content
Cosifne Jan 19, 2024
7f843de
Delete the shared page because every option is language specific option
Cosifne Jan 22, 2024
a717fcb
sort the csharp intellisense page
Cosifne Jan 22, 2024
0fad2df
Onboard first option
Cosifne Jan 22, 2024
6339306
Add second option
Cosifne Jan 22, 2024
ba30675
refactor the code to fit the completion option change
Cosifne Jan 23, 2024
0572471
Add show_completion list in argument list
Cosifne Jan 23, 2024
0bdb6bc
Add show completionItem filter
Cosifne Jan 23, 2024
6cc82b2
Add automatically complete statement on semicolon
Cosifne Jan 23, 2024
89b8b76
Onboard two enum settings
Cosifne Jan 23, 2024
0013f4b
Add show name suggestions
Cosifne Jan 23, 2024
3badcf5
Add show completion items from unimported namepsace
Cosifne Jan 23, 2024
eb41dbf
Simplify the import unimported type checkbox in intellisense page bec…
Cosifne Jan 23, 2024
9fab514
Simplify the new snippet experimence user option
Cosifne Jan 23, 2024
7b80890
Add ShowNewSnippetExperience
Cosifne Jan 23, 2024
d54ab69
Add dotnetEnableArgumentCompletionSnippets
Cosifne Jan 23, 2024
664036c
Delete VB first
Cosifne Jan 23, 2024
9710d02
Add ProvideOptionPage
Cosifne Jan 23, 2024
236ec3a
Merge branch 'dev/shech/cleanUpIntellisensePage' into dev/shech/Unifi…
Cosifne Jan 23, 2024
891c32f
Add enumItemLabels to dotnetReturnKeyCompletionBehavior
Cosifne Jan 23, 2024
6bae5aa
Revert the VS completion service side change
Cosifne Jan 23, 2024
cfaea53
Use package resources
Cosifne Jan 23, 2024
a371067
Change C# to csharp
Cosifne Jan 24, 2024
78f7a0f
Add a message
Cosifne Jan 24, 2024
7e72f2c
Merge remote-tracking branch 'upstream/main' into dev/shech/UnifiedSe…
Cosifne Jan 24, 2024
d487b44
Clean the unexpected change after merge
Cosifne Jan 24, 2024
35f39b2
Add visibleWhen
Cosifne Jan 25, 2024
49f1a6a
Use resources under CSharpPackage
Cosifne Jan 25, 2024
9369a2a
Change enum name to camel case
Cosifne Jan 25, 2024
2922155
Remove completion group and message
Cosifne Jan 25, 2024
16e0367
Remove RequireRestart since it's default false
Cosifne Jan 25, 2024
aded278
Remove prefix
Cosifne Jan 26, 2024
0d6f730
Fix two unchanged name'
Cosifne Jan 26, 2024
a9c7a67
Address feedback
Cosifne Jan 26, 2024
46baab3
Move the logic to CompletionOptions
Cosifne Jan 26, 2024
de558c0
Fix default value
Cosifne Jan 26, 2024
18441b5
Clean up
Cosifne Jan 26, 2024
e4fd498
Remove default
Cosifne Jan 29, 2024
2216329
Correct title
Cosifne Jan 29, 2024
a744ce2
Add comments
Cosifne Jan 29, 2024
9ff765f
Merge branch 'dev/shech/UnifiedSettings0' of https://github.com/Cosif…
Cosifne Jan 29, 2024
1ba00e2
Fix test
Cosifne Feb 7, 2024
b98d535
Fix test
Cosifne Feb 7, 2024
9302bae
Add comment
Cosifne Feb 7, 2024
ea86613
Merge remote-tracking branch 'upstream/main' into dev/shech/UnifiedSe…
Cosifne Feb 8, 2024
d244e26
Fix test
Cosifne Feb 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

using Microsoft.CodeAnalysis.CodeStyle;
using Microsoft.CodeAnalysis.Options;
using Roslyn.Utilities;

namespace Microsoft.CodeAnalysis.Completion;

Expand All @@ -14,7 +15,14 @@ public static CompletionOptions GetCompletionOptions(this IGlobalOptionService o
{
TriggerOnTyping = options.GetOption(TriggerOnTyping, language),
TriggerOnTypingLetters = options.GetOption(TriggerOnTypingLetters, language),
TriggerOnDeletion = options.GetOption(TriggerOnDeletion, language),
TriggerOnDeletion = language switch
{
LanguageNames.CSharp => options.GetOption(TriggerOnTypingLetters, language) && options.GetOption(TriggerOnDeletion, language) is true,
// If the option is null (i.e. default) or 'true', then we want to trigger completion.
// Only if the option is false do we not want to trigger.
LanguageNames.VisualBasic => options.GetOption(TriggerOnDeletion, language) is not false,
_ => throw ExceptionUtilities.Unreachable()
},
TriggerInArgumentLists = options.GetOption(TriggerInArgumentLists, language),
EnterKeyBehavior = options.GetOption(EnterKeyBehavior, language),
SnippetsBehavior = options.GetOption(SnippetsBehavior, language),
Expand Down
2 changes: 0 additions & 2 deletions src/VisualStudio/CSharp/Impl/CSharpPackage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
using Microsoft.VisualStudio.LanguageServices.CSharp.ObjectBrowser;
using Microsoft.VisualStudio.LanguageServices.CSharp.ProjectSystemShim;
using Microsoft.VisualStudio.LanguageServices.CSharp.ProjectSystemShim.Interop;
using Microsoft.VisualStudio.LanguageServices.Implementation;
using Microsoft.VisualStudio.LanguageServices.Implementation.LanguageService;
using Microsoft.VisualStudio.LanguageServices.Implementation.ProjectSystem;
using Microsoft.VisualStudio.LanguageServices.Utilities;
using Microsoft.VisualStudio.Shell;
using Microsoft.VisualStudio.Shell.Interop;
using Task = System.Threading.Tasks.Task;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public IntelliSenseOptionPageControl(OptionStore optionStore) : base(optionStore
BindToOption(Show_completion_item_filters, CompletionViewOptionsStorage.ShowCompletionItemFilters, LanguageNames.CSharp);

BindToOption(Automatically_complete_statement_on_semicolon, CompleteStatementOptionsStorage.AutomaticallyCompleteStatementOnSemicolon);

BindToOption(Never_include_snippets, CompletionOptionsStorage.SnippetsBehavior, SnippetsRule.NeverInclude, LanguageNames.CSharp);
BindToOption(Always_include_snippets, CompletionOptionsStorage.SnippetsBehavior, SnippetsRule.AlwaysInclude, LanguageNames.CSharp);
BindToOption(Include_snippets_when_question_Tab_is_typed_after_an_identifier, CompletionOptionsStorage.SnippetsBehavior, SnippetsRule.IncludeAfterTypingIdentifierQuestionTab, LanguageNames.CSharp);
Expand Down
21 changes: 21 additions & 0 deletions src/VisualStudio/CSharp/Impl/VSPackage.resx
Original file line number Diff line number Diff line change
Expand Up @@ -363,4 +363,25 @@ Show items from unimported namespaces (experimental);</value>
<data name="An_empty_CSharp_script_file" xml:space="preserve">
<value>An empty C# script file.</value>
</data>
<data name="Always_add_new_line_on_enter" xml:space="preserve">
<value>Always add new line on enter</value>
</data>
<data name="Always_include_snippets" xml:space="preserve">
<value>Always include snippets</value>
</data>
<data name="Default" xml:space="preserve">
<value>Default</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_add_new_line_on_enter" xml:space="preserve">
<value>Never add new line on enter</value>
</data>
<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>
35 changes: 35 additions & 0 deletions src/VisualStudio/CSharp/Impl/xlf/VSPackage.cs.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions src/VisualStudio/CSharp/Impl/xlf/VSPackage.de.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions src/VisualStudio/CSharp/Impl/xlf/VSPackage.es.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions src/VisualStudio/CSharp/Impl/xlf/VSPackage.fr.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions src/VisualStudio/CSharp/Impl/xlf/VSPackage.it.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions src/VisualStudio/CSharp/Impl/xlf/VSPackage.ja.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 35 additions & 0 deletions src/VisualStudio/CSharp/Impl/xlf/VSPackage.ko.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading