Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-04 15:25:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

debt - optional chaining

Browse Source
This commit is contained in:
Benjamin Pasero
2019-10-21 15:44:11 +02:00
parent cfb88f21c9
commit 935b0f1c0d
85 changed files with 273 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/code/browser/workbench/workbench.ts
View File

@@ -212,7 +212,7 @@ class WorkspaceProvider implements IWorkspaceProvider {
) { }
async open(workspace: IWorkspace, options?: { reuse?: boolean, payload?: object }): Promise<void> {
if (options && options.reuse && !options.payload && this.isSame(this.workspace, workspace)) {
if (options?.reuse && !options.payload && this.isSame(this.workspace, workspace)) {
return; // return early if workspace and environment is not changing and we are reusing window
}
@@ -233,12 +233,12 @@ class WorkspaceProvider implements IWorkspaceProvider {
}
// Environment
if (options && options.payload) {
if (options?.payload) {
targetHref += `&payload=${encodeURIComponent(JSON.stringify(options.payload))}`;
}
if (targetHref) {
if (options && options.reuse) {
if (options?.reuse) {
window.location.href = targetHref;
} else {
if (isStandalone) {
@@ -290,7 +290,7 @@ class WorkspaceProvider implements IWorkspaceProvider {
// Find payload
let payload = Object.create(null);
if (document && document.location && document.location.search) {
if (document.location.search) {
const query = document.location.search.substring(1);
const vars = query.split('&');
for (let p of vars) {

2
src/vs/code/electron-main/app.ts
View File

@@ -663,7 +663,7 @@ export class CodeApplication extends Disposable {
}
// mac: open-file event received on startup
if (macOpenFiles && macOpenFiles.length && !hasCliArgs && !hasFolderURIs && !hasFileURIs) {
if (macOpenFiles.length && !hasCliArgs && !hasFolderURIs && !hasFileURIs) {
return windowsMainService.open({
context: OpenContext.DOCK,
cli: args,

10
src/vs/code/electron-main/window.ts
View File

@@ -152,12 +152,12 @@ export class CodeWindow extends Disposable implements ICodeWindow {
if (isMacintosh) {
options.acceptFirstMouse = true; // enabled by default
if (windowConfig && windowConfig.clickThroughInactive === false) {
if (windowConfig?.clickThroughInactive === false) {
options.acceptFirstMouse = false;
}
}
const useNativeTabs = isMacintosh && windowConfig && windowConfig.nativeTabs === true;
const useNativeTabs = isMacintosh && windowConfig?.nativeTabs === true;
if (useNativeTabs) {
options.tabbingIdentifier = product.nameShort; // this opts in to sierra tabs
}
@@ -639,7 +639,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
// Set zoomlevel
const windowConfig = this.configurationService.getValue<IWindowSettings>('window');
const zoomLevel = windowConfig && windowConfig.zoomLevel;
const zoomLevel = windowConfig?.zoomLevel;
if (typeof zoomLevel === 'number') {
windowConfiguration.zoomLevel = zoomLevel;
}
@@ -649,7 +649,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
// Set Accessibility Config
let autoDetectHighContrast = true;
if (windowConfig && windowConfig.autoDetectHighContrast === false) {
if (windowConfig?.autoDetectHighContrast === false) {
autoDetectHighContrast = false;
}
windowConfiguration.highContrast = isWindows && autoDetectHighContrast && systemPreferences.isInvertedColorScheme();
@@ -825,7 +825,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
// Multi Montior (fullscreen): try to find the previously used display
if (state.display && state.mode === WindowMode.Fullscreen) {
const display = displays.filter(d => d.id === state.display)[0];
if (display && display.bounds && typeof display.bounds.x === 'number' && typeof display.bounds.y === 'number') {
if (display && typeof display.bounds?.x === 'number' && typeof display.bounds?.y === 'number') {
const defaults = defaultWindowState(WindowMode.Fullscreen); // make sure we have good values when the user restores the window
defaults.x = display.bounds.x; // carefull to use displays x/y position so that the window ends up on the correct monitor
defaults.y = display.bounds.y;