diff --git a/README.md b/README.md index 8888f94..1f60056 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ To restart a Cordova application debugging correctly click on the `Restart Cordo You can debug your app on an Android emulator or an Android/iOS device. If you have your app running in one already, you can attach the debugger to it. The debugger uses the application ID of your project to locate the running instance. > **Visual Studio Emulator for Android:** -> To deploy your app to the Visual Studio Emulator for Android using our extension, you first need to manually launch the emulator. Once it is running, select the `Run Android on Device` debug target rather than the emulator target. If _ADB_ didn't automatically recognize the VS Android emulator when you launched it, you will need to run `adb connect [EMULATOR'S IP]` on the command prompt before trying to deploy. To find out the IP address of your emulator, click the double arrow icon at the bottom of the emulator's side-menu to open the "Additional Tools" window, and go to the "Network" tab. Use the IP of an appropriate network adapter in the list. +> To deploy your app to the Visual Studio Emulator for Android using our extension, you first need to manually launch the emulator. Once it is running, select the `Debug Android on Device` debug target rather than the emulator target. If _ADB_ didn't automatically recognize the VS Android emulator when you launched it, you will need to run `adb connect [EMULATOR'S IP]` on the command prompt before trying to deploy. To find out the IP address of your emulator, click the double arrow icon at the bottom of the emulator's side-menu to open the "Additional Tools" window, and go to the "Network" tab. Use the IP of an appropriate network adapter in the list. We won't go into all of the great things that you can do with the Visual Studio Code debugger, but you can read about it [here](https://code.visualstudio.com/docs/editor/debugging). diff --git a/package.json b/package.json index 232af36..f614a04 100644 --- a/package.json +++ b/package.json @@ -156,10 +156,10 @@ "runtime": "node", "configurationSnippets": [ { - "label": "Cordova: Run Android on device", + "label": "Cordova: Debug Android on device", "description": "%cordova.snippets.androidRunOnDevice%", "body": { - "name": "Run Android on device", + "name": "Debug Android on device", "type": "cordova", "request": "launch", "platform": "android", @@ -170,10 +170,10 @@ } }, { - "label": "Cordova: Run Android on emulator", + "label": "Cordova: Debug Android on emulator", "description": "%cordova.snippets.androidRunOnEmulator%", "body": { - "name": "Run Android on emulator", + "name": "Debug Android on emulator", "type": "cordova", "request": "launch", "platform": "android", @@ -184,10 +184,10 @@ } }, { - "label": "Cordova: Run on iOS device", + "label": "Cordova: Debug on iOS device - experimental", "description": "%cordova.snippets.iOSRunOnDevice%", "body": { - "name": "Run iOS on device", + "name": "Debug iOS on device - experimental", "type": "cordova", "request": "launch", "platform": "ios", @@ -198,10 +198,10 @@ } }, { - "label": "Cordova: Run on iOS simulator - experimental", + "label": "Cordova: Debug on iOS simulator - experimental", "description": "%cordova.snippets.iOSRunOnSimulator%", "body": { - "name": "Run iOS on simulator - experimental", + "name": "Debug iOS on simulator - experimental", "type": "cordova", "request": "launch", "platform": "ios", @@ -240,10 +240,10 @@ } }, { - "label": "Cordova: Attach to running iOS on device", + "label": "Cordova: Attach to running iOS on device - experimental", "description": "%cordova.snippets.iOSAttachOnDevice%", "body": { - "name": "Attach to running iOS on device", + "name": "Attach to running iOS on device - experimental", "type": "cordova", "request": "attach", "platform": "ios", @@ -313,10 +313,10 @@ } }, { - "label": "Cordova: Run Browser", + "label": "Cordova: Debug on Browser", "description": "%cordova.snippets.simulateBrowser%", "body": { - "name": "Run Browser", + "name": "Debug on Browser", "type": "cordova", "request": "launch", "platform": "browser", diff --git a/src/extension/debugConfigurationProvider.ts b/src/extension/debugConfigurationProvider.ts index 8ec04dc..ed984d2 100644 --- a/src/extension/debugConfigurationProvider.ts +++ b/src/extension/debugConfigurationProvider.ts @@ -14,8 +14,8 @@ const localize = nls.loadMessageBundle(); export class CordovaDebugConfigProvider implements vscode.DebugConfigurationProvider { private debugConfigurations = { - "Run Android on emulator": { - name: "Run Android on emulator", + "Debug Android on emulator": { + name: "Debug Android on emulator", type: "cordova", request: "launch", platform: "android", @@ -34,8 +34,8 @@ export class CordovaDebugConfigProvider implements vscode.DebugConfigurationProv sourceMaps: true, cwd: "${workspaceFolder}", }, - "Run Android on device": { - name: "Run Android on device", + "Debug Android on device": { + name: "Debug Android on device", type: "cordova", request: "launch", platform: "android", @@ -54,8 +54,8 @@ export class CordovaDebugConfigProvider implements vscode.DebugConfigurationProv sourceMaps: true, cwd: "${workspaceFolder}", }, - "Run iOS on device": { - name: "Run iOS on device", + "Debug iOS on device - experimental": { + name: "Debug iOS on device - experimental", type: "cordova", request: "launch", platform: "ios", @@ -64,8 +64,8 @@ export class CordovaDebugConfigProvider implements vscode.DebugConfigurationProv sourceMaps: true, cwd: "${workspaceFolder}", }, - "Attach to running iOS on device": { - name: "Attach to running iOS on device", + "Attach to running iOS on device - experimental": { + name: "Attach to running iOS on device - experimental", type: "cordova", request: "attach", platform: "ios", @@ -74,8 +74,8 @@ export class CordovaDebugConfigProvider implements vscode.DebugConfigurationProv sourceMaps: true, cwd: "${workspaceFolder}", }, - "Run iOS on simulator - experimental": { - name: "Run iOS on simulator - experimental", + "Debug iOS on simulator - experimental": { + name: "Debug iOS on simulator - experimental", type: "cordova", request: "launch", platform: "ios", @@ -127,8 +127,8 @@ export class CordovaDebugConfigProvider implements vscode.DebugConfigurationProv sourceMaps: true, cwd: "${workspaceFolder}", }, - "Run Browser": { - name: "Run Browser", + "Debug on Browser": { + name: "Debug on Browser", type: "cordova", request: "launch", platform: "browser", @@ -142,7 +142,7 @@ export class CordovaDebugConfigProvider implements vscode.DebugConfigurationProv private pickConfig: ReadonlyArray = [ { - label: "Run Android on emulator", + label: "Debug Android on emulator", description: localize( "RunAndDebugCordovaAppOnAndroidEmulator", "Run and debug Cordova app on Android emulator", @@ -156,7 +156,7 @@ export class CordovaDebugConfigProvider implements vscode.DebugConfigurationProv ), }, { - label: "Run Android on device", + label: "Debug Android on device", description: localize( "RunAndDebugCordovaAppOnAndroidDevice", "Run and debug Cordova app on Android device", @@ -170,7 +170,7 @@ export class CordovaDebugConfigProvider implements vscode.DebugConfigurationProv ), }, { - label: "Run iOS on simulator - experimental", + label: "Debug iOS on simulator - experimental", description: localize( "RunAndDebugCordovaAppOniOSSimulator", "Run and debug Cordova app on iOS simulator", @@ -184,7 +184,7 @@ export class CordovaDebugConfigProvider implements vscode.DebugConfigurationProv ), }, { - label: "Run iOS on device", + label: "Debug iOS on device", description: localize( "RunAndDebugCordovaAppOniOSDevice", "Run and debug Cordova app on iOS device", @@ -219,7 +219,7 @@ export class CordovaDebugConfigProvider implements vscode.DebugConfigurationProv ), }, { - label: "Run Browser", + label: "Debug on Browser", description: localize( "RunAndDebugCordovaAppInBrowser", "Run and debug Cordova application in browser", @@ -270,7 +270,7 @@ export class CordovaDebugConfigProvider implements vscode.DebugConfigurationProv debugConfigPicker.ignoreFocusOut = true; debugConfigPicker.title = localize("PickDebugConfigurations", "Pick debug configurations"); debugConfigPicker.items = this.pickConfig; - debugConfigPicker.selectedItems = [this.pickConfig[0]]; // the scenario "Run Android on emulator" is selected by default + debugConfigPicker.selectedItems = [this.pickConfig[0]]; // the scenario "Debug Android on emulator" is selected by default return debugConfigPicker; } }