From c84a7156acdfc815e1670b3e32ac07d6e2e7f8a9 Mon Sep 17 00:00:00 2001 From: pflannery Date: Mon, 18 Apr 2016 19:38:07 +0100 Subject: [PATCH] Response to ALL_CAPS_NAMING and code org. --- .../execution/electron-browser/terminal.contribution.ts | 6 +++--- .../execution/{common => electron-browser}/terminal.ts | 6 +++--- .../parts/execution/electron-browser/terminalService.ts | 6 +++--- .../parts/execution/test/browser/terminalService.test.ts | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) rename src/vs/workbench/parts/execution/{common => electron-browser}/terminal.ts (82%) diff --git a/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.ts index 3585107ce7a..ccc14d3039b 100644 --- a/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.ts +++ b/src/vs/workbench/parts/execution/electron-browser/terminal.contribution.ts @@ -20,7 +20,7 @@ import {SyncActionDescriptor} from 'vs/platform/actions/common/actions'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; import {Extensions, IConfigurationRegistry} from 'vs/platform/configuration/common/configurationRegistry'; -import {defaultWindowsTerm, defaultLinuxTerm} from 'vs/workbench/parts/execution/common/terminal'; +import {DEFAILT_WINDOWS_TERM, DEFAULT_LINUX_TERM} from 'vs/workbench/parts/execution/electron-browser/terminal'; let configurationRegistry = Registry.as(Extensions.Configuration); configurationRegistry.registerConfiguration({ @@ -36,7 +36,7 @@ configurationRegistry.registerConfiguration({ 'exec': { 'type': 'string', 'description': nls.localize('terminal.windows.exec', "Customizes which terminal to run."), - 'default': defaultWindowsTerm + 'default': DEFAILT_WINDOWS_TERM } } }, @@ -47,7 +47,7 @@ configurationRegistry.registerConfiguration({ 'exec': { 'type': 'string', 'description': nls.localize('terminal.linux.exec', "Customizes which terminal to run."), - 'default': defaultLinuxTerm + 'default': DEFAULT_LINUX_TERM } } } diff --git a/src/vs/workbench/parts/execution/common/terminal.ts b/src/vs/workbench/parts/execution/electron-browser/terminal.ts similarity index 82% rename from src/vs/workbench/parts/execution/common/terminal.ts rename to src/vs/workbench/parts/execution/electron-browser/terminal.ts index 13860a11411..a577ac0ed45 100644 --- a/src/vs/workbench/parts/execution/common/terminal.ts +++ b/src/vs/workbench/parts/execution/electron-browser/terminal.ts @@ -5,14 +5,14 @@ import fs = require('fs'); import env = require('vs/base/common/platform'); -export let defaultLinuxTerm = 'x-terminal-emulator'; +export let DEFAULT_LINUX_TERM = 'x-terminal-emulator'; // if we're not on debian and using gnome then // set default to gnome-terminal if (env.isLinux && fs.existsSync('/etc/debian_version') === false && process.env.DESKTOP_SESSION === 'gnome') { - defaultLinuxTerm = 'gnome-terminal'; + DEFAULT_LINUX_TERM = 'gnome-terminal'; } -export const defaultWindowsTerm = 'cmd'; \ No newline at end of file +export const DEFAILT_WINDOWS_TERM = 'cmd'; \ No newline at end of file diff --git a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts index 8d0fc12207f..6cf38ff1c91 100644 --- a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts +++ b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts @@ -9,7 +9,7 @@ import uri from 'vs/base/common/uri'; import {TPromise} from 'vs/base/common/winjs.base'; import {ITerminalService} from 'vs/workbench/parts/execution/common/execution'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; -import {defaultWindowsTerm, defaultLinuxTerm} from 'vs/workbench/parts/execution/common/terminal'; +import {DEFAILT_WINDOWS_TERM, DEFAULT_LINUX_TERM} from 'vs/workbench/parts/execution/electron-browser/terminal'; import cp = require('child_process'); import processes = require('vs/base/node/processes'); @@ -42,7 +42,7 @@ export class WinTerminalService implements ITerminalService { private spawnTerminal(spawner, configuration, command: string, path: string, onExit, onError) { let terminalConfig = configuration.terminal; - let exec = terminalConfig.windows.exec || defaultWindowsTerm; + let exec = terminalConfig.windows.exec || DEFAILT_WINDOWS_TERM; let cmdArgs = ['/c', 'start', '/wait', exec]; let child = spawner.spawn(command, cmdArgs, { cwd: path }); @@ -103,7 +103,7 @@ export class LinuxTerminalService implements ITerminalService { private spawnTerminal(spawner, configuration, path: string, onExit, onError) { let terminalConfig = configuration.terminal; - let exec = terminalConfig.linux.exec || defaultLinuxTerm; + let exec = terminalConfig.linux.exec || DEFAULT_LINUX_TERM; const child = spawner.spawn(exec, [], { cwd: path }); child.on('error', onError); child.on('exit', onExit); diff --git a/src/vs/workbench/parts/execution/test/browser/terminalService.test.ts b/src/vs/workbench/parts/execution/test/browser/terminalService.test.ts index a83a0e17e13..c5af7ef8cf2 100644 --- a/src/vs/workbench/parts/execution/test/browser/terminalService.test.ts +++ b/src/vs/workbench/parts/execution/test/browser/terminalService.test.ts @@ -7,7 +7,7 @@ import {equal} from 'assert'; import {WinTerminalService, LinuxTerminalService} from 'vs/workbench/parts/execution/electron-browser/terminalService'; -import {defaultWindowsTerm, defaultLinuxTerm} from 'vs/workbench/parts/execution/common/terminal'; +import {DEFAILT_WINDOWS_TERM, DEFAULT_LINUX_TERM} from 'vs/workbench/parts/execution/electron-browser/terminal'; suite('Execution - TerminalService', () => { let mockOnExit; @@ -61,7 +61,7 @@ suite('Execution - TerminalService', () => { let mockSpawner = { spawn: (command, args, opts) => { // assert - equal(args[args.length - 1], defaultWindowsTerm, 'terminal should equal expected') + equal(args[args.length - 1], DEFAILT_WINDOWS_TERM, 'terminal should equal expected') done(); return { on: (evt) => evt @@ -108,7 +108,7 @@ suite('Execution - TerminalService', () => { let mockSpawner = { spawn: (command, args, opts) => { // assert - equal(command, defaultLinuxTerm, 'terminal should equal expected') + equal(command, DEFAULT_LINUX_TERM, 'terminal should equal expected') done(); return { on: (evt) => evt -- GitLab