Merge branch 'master' into feature/auto-complete-name

ISSUE_TEMPLATE → .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,23 +1,39 @@
-<!-- To prefill this information:
-1. Open Visual Studio Code
-2. Bring up the command palette (press <kbd>F1</kbd>)
-3. Type `CSharp: Report an issue`
-
-If the `CSharp: Report an issue` command doesn't appear, make sure that you have C# extension version 1.17.0 or newer installed.
--->
-
-## Environment data
-`dotnet --info` output:
-VS Code version:
-C# Extension version:
-
-## OmniSharp log
-
-
-## Steps to reproduce
-
-
-## Expected  behavior
-
-
-## Actual behavior
+---
+name: 🐞 Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- To prefill this information:
+1. Open Visual Studio Code
+2. Bring up the command palette (press <kbd>F1</kbd>)
+3. Type `CSharp: Report an issue`
+
+If the `CSharp: Report an issue` command doesn't appear, make sure that you have C# extension version 1.17.0 or newer installed.
+-->
+
+## Environment data
+`dotnet --info` output:
+VS Code version:
+C# Extension version:
+
+## OmniSharp log
+
+
+## Steps to reproduce
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+## Expected  behavior
+A clear and concise description of what you expected to happen.
+
+## Actual behavior
+
+## Additional context
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Issue with Razor (Blazor) tooling
+    url:  https://github.com/dotnet/razor-tooling/issues/new/choose
+    about: Please open issues relating to the Razor tooling in dotnet/razor-tooling.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: 💡 Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+## Is your feature request related to a problem? Please describe.
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+## Describe the solution you would like
+A clear and concise description of what you want to happen.
+
+## Applicable Scenarios
+In what scenarios would the feature apply?
+
+## Describe alternatives you've considered
+A clear and concise description of any alternative solutions or features you've considered.
+
+## Additional context
+Add any other context or screenshots about the feature request here.

src/features/commands.ts

@@ -97,14 +97,14 @@ async function pickProjectAndStart(server: OmniSharpServer, optionProvider: Opti
 }
 
 export async function showProjectSelector(server: OmniSharpServer, targets: LaunchTarget[]): Promise<void> {
-    return vscode.window.showQuickPick(targets, {
+    const launchTarget = await vscode.window.showQuickPick(targets, {
         matchOnDescription: true,
         placeHolder: `Select 1 of ${targets.length} projects`
-    }).then(async launchTarget => {
-        if (launchTarget) {
-            return server.restart(launchTarget);
-        }
     });
+
+    if (launchTarget !== undefined) {
+        return server.restart(launchTarget);
+    }
 }
 
 interface Command {

src/observers/OmnisharpDebugModeLoggerObserver.ts

@@ -57,7 +57,7 @@ export class OmnisharpDebugModeLoggerObserver extends BaseLoggerObserver {
     }
 
     private handleOmnisharpServerRequestCancelled(event: OmnisharpServerRequestCancelled) {
-        this.logger.appendLine(`Cancelled request for ${event.command} (${event.id}).`);
+        this.logger.appendLine(`Cancelled request for ${event.command}${event.id ? ` (${event.id})` : ''}.`);
         this.logger.appendLine();
     }
 
@@ -101,4 +101,4 @@ export class OmnisharpDebugModeLoggerObserver extends BaseLoggerObserver {
             default: throw new Error(`Unknown log level value: ${logLevel}`);
         }
     }
-}
+}

src/omnisharp/loggingEvents.ts

@@ -125,7 +125,7 @@ export class OmnisharpServerDequeueRequest implements BaseEvent {
 
 export class OmnisharpServerRequestCancelled implements BaseEvent {
     type = EventType.OmnisharpServerRequestCancelled;
-    constructor(public command: string, public id: number) { }
+    constructor(public command: string, public id: number | undefined) { }
 }
 
 export class OmnisharpServerProcessRequestStart implements BaseEvent {