ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-04-01 01:20:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

Browse Source 
* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/contrib/externalTerminal/browser/externalTerminal.contribution.ts
View File

@@ -10,7 +10,8 @@ import { URI } from 'vs/base/common/uri';
import { IExternalTerminalConfiguration, IExternalTerminalService } from 'vs/workbench/contrib/externalTerminal/common/externalTerminal';
import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import { ITerminalService as IIntegratedTerminalService, KEYBINDING_CONTEXT_TERMINAL_NOT_FOCUSED } from 'vs/workbench/contrib/terminal/common/terminal';
import { KEYBINDING_CONTEXT_TERMINAL_NOT_FOCUSED } from 'vs/workbench/contrib/terminal/common/terminal';
import { ITerminalService as IIntegratedTerminalService } from 'vs/workbench/contrib/terminal/browser/terminal';
import { IHistoryService } from 'vs/workbench/services/history/common/history';
import { ResourceContextKey } from 'vs/workbench/common/resources';
import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';

2
src/vs/workbench/contrib/externalTerminal/common/externalTerminal.ts
View File

@@ -14,7 +14,7 @@ export interface IExternalTerminalSettings {
}
export interface IExternalTerminalService {
_serviceBrand: any;
_serviceBrand: undefined;
openTerminal(path: string): void;
runInTerminal(title: string, cwd: string, args: string[], env: { [key: string]: string | null; }, settings: IExternalTerminalSettings): Promise<number | undefined>;
}

8
src/vs/workbench/contrib/externalTerminal/node/externalTerminalService.ts
View File

@@ -23,7 +23,7 @@ const TERMINAL_TITLE = nls.localize('console.title', "VS Code Console");
export const DEFAULT_TERMINAL_OSX = 'Terminal.app';
export class WindowsExternalTerminalService implements IExternalTerminalService {
public _serviceBrand: any;
public _serviceBrand: undefined;
private static readonly CMD = 'cmd.exe';
@@ -118,7 +118,7 @@ export class WindowsExternalTerminalService implements IExternalTerminalService
}
export class MacExternalTerminalService implements IExternalTerminalService {
public _serviceBrand: any;
public _serviceBrand: undefined;
private static readonly OSASCRIPT = '/usr/bin/osascript'; // osascript is the AppleScript interpreter on OS X
@@ -214,7 +214,7 @@ export class MacExternalTerminalService implements IExternalTerminalService {
}
export class LinuxExternalTerminalService implements IExternalTerminalService {
public _serviceBrand: any;
public _serviceBrand: undefined;
private static readonly WAIT_MESSAGE = nls.localize('press.any.key', "Press any key to continue...");
@@ -305,7 +305,7 @@ export class LinuxExternalTerminalService implements IExternalTerminalService {
if (!LinuxExternalTerminalService._DEFAULT_TERMINAL_LINUX_READY) {
LinuxExternalTerminalService._DEFAULT_TERMINAL_LINUX_READY = new Promise<string>(c => {
if (env.isLinux) {
Promise.all([pfs.exists('/etc/debian_version'), process.lazyEnv || Promise.resolve(undefined)]).then(([isDebian]) => {
Promise.all([pfs.exists('/etc/debian_version'), Promise.resolve(process.lazyEnv) || Promise.resolve(undefined)]).then(([isDebian]) => {
if (isDebian) {
c('x-terminal-emulator');
} else if (process.env.DESKTOP_SESSION === 'gnome' || process.env.DESKTOP_SESSION === 'gnome-classic') {