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 05fc61ffb1aee9fd19173c32113daed079f9b7bd (#5074)

Browse Source 
* Merge from vscode 05fc61ffb1aee9fd19173c32113daed079f9b7bd

* fix tests
This commit is contained in:
Anthony Dresser
2019-04-16 22:11:30 -07:00
committed by GitHub
parent 2f8519cb6b
commit 8956b591f7
217 changed files with 5120 additions and 3926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/common/editor/textEditorModel.ts
View File

@@ -3,14 +3,13 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { ITextModel, ITextBufferFactory } from 'vs/editor/common/model';
import { ITextModel, ITextBufferFactory, ITextSnapshot } from 'vs/editor/common/model';
import { EditorModel } from 'vs/workbench/common/editor';
import { URI } from 'vs/base/common/uri';
import { ITextEditorModel, IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
import { IModeService, ILanguageSelection } from 'vs/editor/common/services/modeService';
import { IModelService } from 'vs/editor/common/services/modelService';
import { IDisposable } from 'vs/base/common/lifecycle';
import { ITextSnapshot } from 'vs/platform/files/common/files';
/**
* The base text editor model leverages the code editor model. This class is only intended to be subclassed and not instantiated.

8
src/vs/workbench/common/theme.ts
View File

@@ -313,7 +313,13 @@ export const STATUS_BAR_HOST_NAME_BACKGROUND = registerColor('statusBarItem.host
dark: STATUS_BAR_PROMINENT_ITEM_BACKGROUND,
light: STATUS_BAR_PROMINENT_ITEM_BACKGROUND,
hc: STATUS_BAR_PROMINENT_ITEM_BACKGROUND
}, nls.localize('statusBarItemHostBackground', "Background color for the remote host name on the status bar."));
}, nls.localize('statusBarItemHostBackground', "Background color for the host indicator on the status bar."));
export const STATUS_BAR_HOST_NAME_FOREGROUND = registerColor('statusBarItem.hostForeground', {
dark: STATUS_BAR_PROMINENT_ITEM_FOREGROUND,
light: STATUS_BAR_PROMINENT_ITEM_FOREGROUND,
hc: STATUS_BAR_PROMINENT_ITEM_FOREGROUND
}, nls.localize('statusBarItemHostForeground', "Foreground color for the host indicator on the status bar."));
// < --- Activity Bar --- >