Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move off startSessionCommand and startDebug.
See #429 and microsoft/vscode#33791
- Loading branch information
Showing
4 changed files
with
106 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| "use strict"; | ||
|
|
||
| import * as path from "path"; | ||
| import { analytics } from "../analytics"; | ||
| import { config } from "../config"; | ||
| import { DebugConfigurationProvider, WorkspaceFolder, CancellationToken, DebugConfiguration, ProviderResult } from "vscode"; | ||
| import { FlutterLaunchRequestArguments, isWin } from "../debug/utils"; | ||
| import { Sdks, isFlutterProject } from "../utils"; | ||
| import { FlutterDeviceManager } from "../flutter/device_manager"; | ||
| import { SdkCommands } from "../commands/sdk"; | ||
|
|
||
| export const DART_CLI_DEBUG_TYPE = "dart-cli"; | ||
| export const FLUTTER_DEBUG_TYPE = "flutter"; | ||
|
|
||
| export class DebugConfigProvider implements DebugConfigurationProvider { | ||
| private debugType: String; | ||
| private sdks: Sdks; | ||
| private deviceManager: FlutterDeviceManager; | ||
|
|
||
| constructor(debugType: String, sdks: Sdks, deviceManager: FlutterDeviceManager) { | ||
| this.debugType = debugType; | ||
| this.sdks = sdks; | ||
| this.deviceManager = deviceManager; | ||
| } | ||
|
|
||
| // TODO: This file has two ways of knowing whether it's a Flutter debug session - this.debugType and util.isFlutterProject. | ||
| // Hopefully these will always match, but since a user can edit launch.json it's not guaranteed. We should probably | ||
| // do something to consolidate these and/or reject when the launch config doesn't match the proejct type. | ||
|
|
||
| provideDebugConfigurations(folder: WorkspaceFolder | undefined, token?: CancellationToken): ProviderResult<DebugConfiguration[]> { | ||
| if (this.debugType == DART_CLI_DEBUG_TYPE) | ||
| return [{ | ||
| "name": "Dart command line", | ||
| "type": "dart-cli", | ||
| "request": "launch", | ||
| "program": "${workspaceRoot}/bin/main.dart" | ||
| }]; | ||
| else if (this.debugType == FLUTTER_DEBUG_TYPE) | ||
| return [{ | ||
| "name": "Flutter mobile app", | ||
| "type": "flutter", | ||
| "request": "launch" | ||
| }]; | ||
| } | ||
|
|
||
| resolveDebugConfiguration(folder: WorkspaceFolder | undefined, debugConfig: DebugConfiguration, token?: CancellationToken): ProviderResult<DebugConfiguration> { | ||
| // TODO: This cast feels nasty? | ||
| this.setupDebugConfig(<FlutterLaunchRequestArguments><any>debugConfig, this.sdks, this.deviceManager && this.deviceManager.currentDevice ? this.deviceManager.currentDevice.id : null); | ||
|
|
||
| if (isFlutterProject) { | ||
| SdkCommands.resetFlutterSettings(); | ||
| debugConfig.program = debugConfig.program || "${workspaceRoot}/lib/main.dart"; // Set Flutter default path. | ||
| } | ||
|
|
||
| return debugConfig; | ||
| } | ||
|
|
||
| private setupDebugConfig(debugConfig: FlutterLaunchRequestArguments, sdks: Sdks, deviceId: string) { | ||
| analytics.logDebuggerStart(); | ||
|
|
||
| const dartExec = isWin ? "dart.exe" : "dart"; | ||
| const flutterExec = isWin ? "flutter.bat" : "flutter"; | ||
|
|
||
| // Attach any properties that weren't explicitly set. | ||
| debugConfig.cwd = debugConfig.cwd || "${workspaceRoot}"; | ||
| debugConfig.args = debugConfig.args || []; | ||
| debugConfig.dartPath = debugConfig.dartPath || path.join(sdks.dart, "bin", dartExec); | ||
| debugConfig.observatoryLogFile = debugConfig.observatoryLogFile || config.observatoryLogFile; | ||
| debugConfig.debugSdkLibraries = debugConfig.debugSdkLibraries || config.debugSdkLibraries; | ||
| debugConfig.debugExternalLibraries = debugConfig.debugExternalLibraries || config.debugExternalLibraries; | ||
| if (debugConfig.checkedMode === undefined) | ||
| debugConfig.checkedMode = true; | ||
| debugConfig.flutterPath = debugConfig.flutterPath || (sdks.flutter ? path.join(sdks.flutter, "bin", flutterExec) : null); | ||
| debugConfig.flutterRunLogFile = debugConfig.flutterRunLogFile || config.flutterRunLogFile; | ||
| debugConfig.deviceId = debugConfig.deviceId || deviceId; | ||
| } | ||
| } |