提交 c84a7156 编写于 作者: P pflannery

Response to ALL_CAPS_NAMING and code org.

上级 aa3f8d74
...@@ -20,7 +20,7 @@ import {SyncActionDescriptor} from 'vs/platform/actions/common/actions'; ...@@ -20,7 +20,7 @@ import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes';
import {Extensions, IConfigurationRegistry} from 'vs/platform/configuration/common/configurationRegistry'; 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 = <IConfigurationRegistry>Registry.as(Extensions.Configuration); let configurationRegistry = <IConfigurationRegistry>Registry.as(Extensions.Configuration);
configurationRegistry.registerConfiguration({ configurationRegistry.registerConfiguration({
...@@ -36,7 +36,7 @@ configurationRegistry.registerConfiguration({ ...@@ -36,7 +36,7 @@ configurationRegistry.registerConfiguration({
'exec': { 'exec': {
'type': 'string', 'type': 'string',
'description': nls.localize('terminal.windows.exec', "Customizes which terminal to run."), 'description': nls.localize('terminal.windows.exec', "Customizes which terminal to run."),
'default': defaultWindowsTerm 'default': DEFAILT_WINDOWS_TERM
} }
} }
}, },
...@@ -47,7 +47,7 @@ configurationRegistry.registerConfiguration({ ...@@ -47,7 +47,7 @@ configurationRegistry.registerConfiguration({
'exec': { 'exec': {
'type': 'string', 'type': 'string',
'description': nls.localize('terminal.linux.exec', "Customizes which terminal to run."), 'description': nls.localize('terminal.linux.exec', "Customizes which terminal to run."),
'default': defaultLinuxTerm 'default': DEFAULT_LINUX_TERM
} }
} }
} }
......
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
import fs = require('fs'); import fs = require('fs');
import env = require('vs/base/common/platform'); 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 // if we're not on debian and using gnome then
// set default to gnome-terminal // set default to gnome-terminal
if (env.isLinux if (env.isLinux
&& fs.existsSync('/etc/debian_version') === false && fs.existsSync('/etc/debian_version') === false
&& process.env.DESKTOP_SESSION === 'gnome') { && process.env.DESKTOP_SESSION === 'gnome') {
defaultLinuxTerm = 'gnome-terminal'; DEFAULT_LINUX_TERM = 'gnome-terminal';
} }
export const defaultWindowsTerm = 'cmd'; export const DEFAILT_WINDOWS_TERM = 'cmd';
\ No newline at end of file \ No newline at end of file
...@@ -9,7 +9,7 @@ import uri from 'vs/base/common/uri'; ...@@ -9,7 +9,7 @@ import uri from 'vs/base/common/uri';
import {TPromise} from 'vs/base/common/winjs.base'; import {TPromise} from 'vs/base/common/winjs.base';
import {ITerminalService} from 'vs/workbench/parts/execution/common/execution'; import {ITerminalService} from 'vs/workbench/parts/execution/common/execution';
import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; 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 cp = require('child_process');
import processes = require('vs/base/node/processes'); import processes = require('vs/base/node/processes');
...@@ -42,7 +42,7 @@ export class WinTerminalService implements ITerminalService { ...@@ -42,7 +42,7 @@ export class WinTerminalService implements ITerminalService {
private spawnTerminal(spawner, configuration, command: string, path: string, onExit, onError) { private spawnTerminal(spawner, configuration, command: string, path: string, onExit, onError) {
let terminalConfig = configuration.terminal; 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 cmdArgs = ['/c', 'start', '/wait', exec];
let child = spawner.spawn(command, cmdArgs, { cwd: path }); let child = spawner.spawn(command, cmdArgs, { cwd: path });
...@@ -103,7 +103,7 @@ export class LinuxTerminalService implements ITerminalService { ...@@ -103,7 +103,7 @@ export class LinuxTerminalService implements ITerminalService {
private spawnTerminal(spawner, configuration, path: string, onExit, onError) { private spawnTerminal(spawner, configuration, path: string, onExit, onError) {
let terminalConfig = configuration.terminal; 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 }); const child = spawner.spawn(exec, [], { cwd: path });
child.on('error', onError); child.on('error', onError);
child.on('exit', onExit); child.on('exit', onExit);
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
import {equal} from 'assert'; import {equal} from 'assert';
import {WinTerminalService, LinuxTerminalService} from 'vs/workbench/parts/execution/electron-browser/terminalService'; 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', () => { suite('Execution - TerminalService', () => {
let mockOnExit; let mockOnExit;
...@@ -61,7 +61,7 @@ suite('Execution - TerminalService', () => { ...@@ -61,7 +61,7 @@ suite('Execution - TerminalService', () => {
let mockSpawner = { let mockSpawner = {
spawn: (command, args, opts) => { spawn: (command, args, opts) => {
// assert // assert
equal(args[args.length - 1], defaultWindowsTerm, 'terminal should equal expected') equal(args[args.length - 1], DEFAILT_WINDOWS_TERM, 'terminal should equal expected')
done(); done();
return { return {
on: (evt) => evt on: (evt) => evt
...@@ -108,7 +108,7 @@ suite('Execution - TerminalService', () => { ...@@ -108,7 +108,7 @@ suite('Execution - TerminalService', () => {
let mockSpawner = { let mockSpawner = {
spawn: (command, args, opts) => { spawn: (command, args, opts) => {
// assert // assert
equal(command, defaultLinuxTerm, 'terminal should equal expected') equal(command, DEFAULT_LINUX_TERM, 'terminal should equal expected')
done(); done();
return { return {
on: (evt) => evt on: (evt) => evt
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册