Cleanup

Author: dibarbet

src/lsptoolshost/optionChanges.ts

@@ -40,7 +40,6 @@ function handleLanguageServerOptionChanges(changedOptions: OptionChanges): void
     };
     if (changedOptions.changedCommonOptions.find((key) => key === 'useOmnisharpServer')) {
         // If the user has changed the useOmnisharpServer flag we need to reload the window.
-        // Intentionally not awaiting this promise - we don't want to block handling changes on showing the notification prompt.
         showInformationMessage(
             vscode,
             vscode.l10n.t(
@@ -56,6 +55,5 @@ function handleLanguageServerOptionChanges(changedOptions: OptionChanges): void
     const message = vscode.l10n.t(
         'C# configuration has changed. Would you like to reload the window to apply your changes?'
     );
-    // Intentionally not awaiting this promise - we don't want to block handling changes on showing the notification prompt.
     showInformationMessage(vscode, message, reloadTitle);
 }

src/lsptoolshost/restore.ts

@@ -80,7 +80,6 @@ export async function restore(
     showOutput: boolean
 ): Promise<void> {
     if (_restoreInProgress) {
-        // Show error message but don't await the dismissal of it.
         showErrorMessage(vscode, vscode.l10n.t('Restore already in progress'));
         return;
     }

src/shared/configurationProvider.ts

@@ -245,7 +245,7 @@ export class BaseVsDbgConfigurationProvider implements vscode.DebugConfiguration
                     action: async () => {
                         const returnData = await createSelfSignedCert(dotnetPath);
                         if (returnData.error === null) {
-                            //if the prcess returns 0, returnData.error is null, otherwise the return code can be acessed in returnData.error.code
+                            // if the process returns 0, returnData.error is null, otherwise the return code can be accessed in returnData.error.code
                             const message =
                                 errorCode === CertToolStatusCodes.CertificateNotTrusted ? 'trusted' : 'created';
                             showInformationMessage(

src/shared/observers/utils/showMessage.ts

@@ -81,22 +81,15 @@ function showMessage(
     delegateFunc(message, messageOptions, ...items).then(
         async (selectedItem) => {
             if (selectedItem) {
-                const item = items.find((i) => i);
-                if (item === undefined) {
-                    // This should never happen - we got an item back that we didn't provide
-                    throw new Error(
-                        `Could not find item with message: ${selectedItem}; items:${JSON.stringify(items)}`
-                    );
-                }
-                if (typeof item === 'string') {
+                if (typeof selectedItem === 'string') {
                     return;
-                } else if ('action' in item && item.action) {
-                    await item.action();
-                } else if ('command' in item && item.command) {
-                    if (item.arguments) {
-                        await vscode.commands.executeCommand(item.command, ...item.arguments);
+                } else if ('action' in selectedItem && selectedItem.action) {
+                    await selectedItem.action();
+                } else if ('command' in selectedItem && selectedItem.command) {
+                    if (selectedItem.arguments) {
+                        await vscode.commands.executeCommand(selectedItem.command, ...selectedItem.arguments);
                     } else {
-                        await vscode.commands.executeCommand(item.command);
+                        await vscode.commands.executeCommand(selectedItem.command);
                     }
                 }
             }