mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-06-16 17:05:07 -04:00
Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c (#8525)
* Merge from vscode a5cf1da01d5db3d2557132be8d30f89c38019f6c * remove files we don't want * fix hygiene * update distro * update distro * fix hygiene * fix strict nulls * distro * distro * fix tests * fix tests * add another edit * fix viewlet icon * fix azure dialog * fix some padding * fix more padding issues
This commit is contained in:
@@ -4,7 +4,6 @@
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import 'vs/css!./media/editor';
|
||||
import 'vs/css!./media/tokens';
|
||||
import * as nls from 'vs/nls';
|
||||
import * as dom from 'vs/base/browser/dom';
|
||||
import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
|
||||
@@ -41,7 +40,7 @@ import * as modes from 'vs/editor/common/modes';
|
||||
import { editorUnnecessaryCodeBorder, editorUnnecessaryCodeOpacity } from 'vs/editor/common/view/editorColorRegistry';
|
||||
import { editorErrorBorder, editorErrorForeground, editorHintBorder, editorHintForeground, editorInfoBorder, editorInfoForeground, editorWarningBorder, editorWarningForeground, editorForeground } from 'vs/platform/theme/common/colorRegistry';
|
||||
import { VerticalRevealType } from 'vs/editor/common/view/viewEvents';
|
||||
import { IEditorWhitespace } from 'vs/editor/common/viewLayout/whitespaceComputer';
|
||||
import { IEditorWhitespace } from 'vs/editor/common/viewLayout/linesLayout';
|
||||
import { ViewModel } from 'vs/editor/common/viewModel/viewModelImpl';
|
||||
import { ICommandService } from 'vs/platform/commands/common/commands';
|
||||
import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
|
||||
@@ -870,9 +869,11 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
|
||||
}
|
||||
|
||||
public onVisible(): void {
|
||||
this._modelData?.view.refreshFocusState();
|
||||
}
|
||||
|
||||
public onHide(): void {
|
||||
this._modelData?.view.refreshFocusState();
|
||||
}
|
||||
|
||||
public getContribution<T extends editorCommon.IEditorContribution>(id: string): T {
|
||||
@@ -1371,6 +1372,9 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
|
||||
const e2: ICursorSelectionChangedEvent = {
|
||||
selection: e.selections[0],
|
||||
secondarySelections: e.selections.slice(1),
|
||||
modelVersionId: e.modelVersionId,
|
||||
oldSelections: e.oldSelections,
|
||||
oldModelVersionId: e.oldModelVersionId,
|
||||
source: e.source,
|
||||
reason: e.reason
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user