-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #69 from franneck94/fixEmptyArgs
Fix empty args
- Loading branch information
Showing
47 changed files
with
242 additions
and
435 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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
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,159 @@ | ||
| import * as path from 'path'; | ||
| import * as vscode from 'vscode'; | ||
|
|
||
| import { extensionPath } from '../extension'; | ||
| import { readJsonFile, writeJsonFile } from '../utils/fileUtils'; | ||
| import { | ||
| Builds, | ||
| JsonConfiguration, | ||
| JsonTask, | ||
| OperatingSystems, | ||
| Task, | ||
| } from '../utils/types'; | ||
| import { getLaunchConfigIndex } from '../utils/vscodeUtils'; | ||
| import { SettingsProvider } from './settingsProvider'; | ||
|
|
||
| const EXTENSION_NAME = 'C_Cpp_Runner'; | ||
| const CONFIG_NAME = 'C/C++ Runner: Debug Session'; | ||
|
|
||
| export class TaskProvider implements vscode.TaskProvider { | ||
| private readonly _tasksFile: string; | ||
| public tasks: Task[] | undefined; | ||
|
|
||
| constructor( | ||
| private readonly _settingsProvider: SettingsProvider, | ||
| public workspaceFolder: string | undefined, | ||
| public activeFolder: string | undefined, | ||
| public buildMode: Builds, | ||
| ) { | ||
| const templateDirectory = path.join( | ||
| extensionPath ? extensionPath : '', | ||
| 'templates', | ||
| ); | ||
| this._tasksFile = path.join(templateDirectory, 'tasks_template.json'); | ||
|
|
||
| this.getTasks(); | ||
| } | ||
|
|
||
| public async resolveTask(task: Task) { | ||
| return task; | ||
| } | ||
|
|
||
| public provideTasks() { | ||
| return this.getTasks(); | ||
| } | ||
|
|
||
| public getTasks() { | ||
| if (!this.activeFolder) return []; | ||
|
|
||
| this.setTasksDefinition(); | ||
|
|
||
| if (!this.tasks) return []; | ||
|
|
||
| return this.tasks; | ||
| } | ||
|
|
||
| private setTasksDefinition() { | ||
| const taskType = 'shell'; | ||
| const configJson: JsonTask = readJsonFile(this._tasksFile); | ||
|
|
||
| if (!configJson) { | ||
| return []; | ||
| } | ||
|
|
||
| this.tasks = []; | ||
|
|
||
| for (const taskJson of configJson.tasks) { | ||
| if (taskJson.type !== taskType) { | ||
| continue; | ||
| } | ||
| if (taskJson.options) { | ||
| if (taskJson.options.hide) { | ||
| continue; | ||
| } | ||
| } | ||
|
|
||
| const shellCommand = `${taskJson.command} ${taskJson.args.join(' ')}`; | ||
|
|
||
| const definition = { | ||
| type: taskType, | ||
| task: taskJson.label, | ||
| }; | ||
| const problemMatcher = '$gcc'; | ||
| const scope = vscode.TaskScope.Workspace; | ||
| let execution: vscode.ShellExecution; | ||
|
|
||
| if (this._settingsProvider.operatingSystem === OperatingSystems.windows) { | ||
| const shellOptions: vscode.ShellExecutionOptions = { | ||
| executable: 'C:/Windows/System32/cmd.exe', | ||
| shellArgs: ['/d', '/c'], | ||
| }; | ||
| execution = new vscode.ShellExecution(shellCommand, shellOptions); | ||
| } else { | ||
| execution = new vscode.ShellExecution(shellCommand); | ||
| } | ||
|
|
||
| const task = new Task( | ||
| definition, | ||
| scope, | ||
| taskJson.label, | ||
| EXTENSION_NAME, | ||
| execution, | ||
| problemMatcher, | ||
| ); | ||
|
|
||
| this.tasks.push(task); | ||
| } | ||
|
|
||
| return this.tasks; | ||
| } | ||
|
|
||
| public updateModeData(buildMode: Builds) { | ||
| this.buildMode = buildMode; | ||
| } | ||
|
|
||
| public updateFolderData( | ||
| workspaceFolder: string | undefined, | ||
| activeFolder: string | undefined, | ||
| ) { | ||
| this.resetArguments(); | ||
|
|
||
| this.workspaceFolder = workspaceFolder; | ||
| this.activeFolder = activeFolder; | ||
| } | ||
|
|
||
| private resetArguments() { | ||
| if (this.workspaceFolder) { | ||
| const launchPath = path.join( | ||
| this.workspaceFolder, | ||
| '.vscode', | ||
| 'launch.json', | ||
| ); | ||
|
|
||
| const configJson: JsonConfiguration | undefined = readJsonFile( | ||
| launchPath, | ||
| ); | ||
|
|
||
| if (configJson) { | ||
| const configIdx = getLaunchConfigIndex(configJson, CONFIG_NAME); | ||
|
|
||
| if (configIdx === undefined) return; | ||
|
|
||
| configJson.configurations[configIdx].args = []; | ||
| writeJsonFile(launchPath, configJson); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public getProjectFolder() { | ||
| if (this.activeFolder) { | ||
| return this.activeFolder; | ||
| } | ||
|
|
||
| if (this.workspaceFolder) { | ||
| return this.workspaceFolder; | ||
| } | ||
|
|
||
| return undefined; | ||
| } | ||
| } |
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
Oops, something went wrong.