ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356)

Browse Source
This commit is contained in:
Anthony Dresser
2019-09-24 21:36:17 -07:00
committed by GitHub
parent a29ae4d3b9
commit 6a6048d40f
541 changed files with 7045 additions and 7287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/editor/standalone/browser/simpleServices.ts
View File

@@ -420,7 +420,7 @@ export class SimpleConfigurationService implements IConfigurationService {
_serviceBrand: undefined;
private _onDidChangeConfiguration = new Emitter<IConfigurationChangeEvent>();
private readonly _onDidChangeConfiguration = new Emitter<IConfigurationChangeEvent>();
public readonly onDidChangeConfiguration: Event<IConfigurationChangeEvent> = this._onDidChangeConfiguration.event;
private readonly _configuration: Configuration;

12
src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts
View File

@@ -15,19 +15,19 @@ import { IResourceInput } from 'vs/platform/editor/common/editor';
export class StandaloneCodeEditorServiceImpl extends CodeEditorServiceImpl {
public getActiveCodeEditor(): ICodeEditor | null {
return null; // not supported in the standalone case
public getActiveCodeEditor(): ICodeEditor | undefined {
return undefined; // not supported in the standalone case
}
public openCodeEditor(input: IResourceInput, source: ICodeEditor | null, sideBySide?: boolean): Promise<ICodeEditor | null> {
public openCodeEditor(input: IResourceInput, source: ICodeEditor | undefined, sideBySide?: boolean): Promise<ICodeEditor | undefined> {
if (!source) {
return Promise.resolve(null);
return Promise.resolve(undefined);
}
return Promise.resolve(this.doOpenEditor(source, input));
}
private doOpenEditor(editor: ICodeEditor, input: IResourceInput): ICodeEditor | null {
private doOpenEditor(editor: ICodeEditor, input: IResourceInput): ICodeEditor | undefined {
const model = this.findModel(editor, input.resource);
if (!model) {
if (input.resource) {
@@ -39,7 +39,7 @@ export class StandaloneCodeEditorServiceImpl extends CodeEditorServiceImpl {
return editor;
}
}
return null;
return undefined;
}
const selection = <IRange>(input.options ? input.options.selection : null);