Merge from vscode 313ede61cbad8f9dc748907b3384e059ddddb79a (#7436)

* Merge from vscode 313ede61cbad8f9dc748907b3384e059ddddb79a

* fix strict null checks
This commit is contained in:
Anthony Dresser
2019-09-30 23:35:45 -07:00
committed by GitHub
parent 6ab03053a0
commit 084524cd2d
196 changed files with 2927 additions and 2547 deletions

View File

@@ -163,7 +163,7 @@ export class OpenWorkspaceButtonContribution extends Disposable implements IEdit
this._register(this.openWorkspaceButton.onClick(() => {
const model = this.editor.getModel();
if (model) {
this.hostService.openInWindow([{ workspaceUri: model.uri }]);
this.hostService.openWindow([{ workspaceUri: model.uri }]);
}
}));

View File

@@ -34,7 +34,7 @@ export class NoTabsTitleControl extends TitleControl {
this.registerContainerListeners();
// Gesture Support
Gesture.addTarget(this.titleContainer);
this._register(Gesture.addTarget(this.titleContainer));
const labelContainer = document.createElement('div');
addClass(labelContainer, 'label-container');

View File

@@ -435,7 +435,7 @@ export class TabsTitleControl extends TitleControl {
addClass(tabContainer, 'tab');
// Gesture Support
Gesture.addTarget(tabContainer);
this._register(Gesture.addTarget(tabContainer));
// Tab Border Top
const tabBorderTopContainer = document.createElement('div');

View File

@@ -10,6 +10,7 @@
height: 22px;
font-size: 12px;
display: flex;
overflow: visible;
}
.monaco-workbench .part.statusbar.status-border-top::after {
@@ -52,7 +53,7 @@
.monaco-workbench .part.statusbar > .items-container > .statusbar-item.has-beak:before {
content: '';
position: absolute;
left: calc(50% - 8px); /* 3px (margin) + 5px (padding) = 8px */
left: calc(50% - 9px); /* 3px (margin) + 5px (padding) + 1px (icon) = 9px */
top: -5px;
border-bottom-width: 5px;
border-bottom-style: solid;

View File

@@ -223,7 +223,7 @@ export abstract class MenubarControl extends Disposable {
const ret: IAction = new Action(commandId, unmnemonicLabel(label), undefined, undefined, (event) => {
const openInNewWindow = event && ((!isMacintosh && (event.ctrlKey || event.shiftKey)) || (isMacintosh && (event.metaKey || event.altKey)));
return this.hostService.openInWindow([openable], {
return this.hostService.openWindow([openable], {
forceNewWindow: openInNewWindow
});
});