Merged PR 476382: Merge prerelease into features/lsp_tools_host

Related work items: #1829814, #1830006

Author: Andrew Hall (METAL)

README.md

@@ -20,8 +20,8 @@ Note: If working on a solution that requires versions prior to .NET 6, install a
   * Code Completions
   * Roslyn powered semantic awareness
 
-## How to use Omnisharp?
-If you don’t want to take advantage of the great Language Server features, you can revert back to using Omnisharp in the pre-release extension by going to the Extension settings and setting `dotnet.server.useOmnisharp` to true. This will require that you restart VS Code to take effect. You can also switch back to the Switch to Release Version to revert back to the C# extension powered by OmniSharp.
+## How to use OmniSharp?
+If you don’t want to take advantage of the great Language Server features, you can revert back to using OmniSharp in the pre-release extension by going to the Extension settings and setting `dotnet.server.useOmnisharp` to true. This will require that you restart VS Code to take effect. You can also switch back to the Switch to Release Version to revert back to the C# extension powered by OmniSharp.
 
 
 ## Found a Bug?
@@ -46,7 +46,7 @@ For more information see the [.NET Foundation Code of Conduct](http://www.dotnet
 
 ### Contribution License Agreement
 
-By signing the [CLA](https://cla.dotnetfoundation.org/OmniSharp/omnisharp-roslyn), the community is free to use your contribution to [.NET Foundation](http://www.dotnetfoundation.org) projects.
+By signing the [CLA](https://cla.dotnetfoundation.org/), the community is free to use your contribution to [.NET Foundation](http://www.dotnetfoundation.org) projects.
 
 ### .NET Foundation
 
@@ -69,4 +69,4 @@ If someone has already filed an issue that encompasses your feedback, please lea
 Let us know what you think of the extension by taking the quick survey.
 
 
-[csdevkitextension]: https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.vscodeintellicode-csharp
+[csdevkitextension]: https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csdevkit

package.json

@@ -1643,12 +1643,14 @@
       {
         "command": "csharp.reportIssue",
         "title": "Report an issue",
-        "category": "CSharp"
+        "category": "CSharp",
+        "enablement": "config.dotnet.server.useOmnisharp"
       },
       {
         "command": "csharp.showDecompilationTerms",
         "title": "Show the decompiler terms agreement",
-        "category": "CSharp"
+        "category": "CSharp",
+        "enablement": "config.dotnet.server.useOmnisharp"
       },
       {
         "command": "extension.showRazorCSharpWindow",

src/razor/src/Completion/RazorCompletionItemProvider.ts

@@ -118,6 +118,15 @@ export class RazorCompletionItemProvider
                     completionItem.commitCharacters = completionItem.commitCharacters.filter(
                         commitChar => commitChar !== '{' && commitChar !== '(' && commitChar !== '*');
                 }
+
+                // for intellicode items, manually set the insertText to avoid including stars in the commit
+                if (completionItem.label.toString().includes('\u2605')){
+                    // vscode.CompletionItem does not have textEditText, which was added in 3.17
+                    let intellicodeCompletion: CompletionItem = completionItem as CompletionItem;
+                    if (intellicodeCompletion.textEditText){
+                        completionItem.insertText = intellicodeCompletion.textEditText;
+                    }
+                }
             }
 
             const isIncomplete = completions instanceof Array ? false