mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-14 03:21:36 -04:00
* Fix initial build breaks from 1.67 merge (#2514) * Update yarn lock files * Update build scripts * Fix tsconfig * Build breaks * WIP * Update yarn lock files * Misc breaks * Updates to package.json * Breaks * Update yarn * Fix breaks * Breaks * Build breaks * Breaks * Breaks * Breaks * Breaks * Breaks * Missing file * Breaks * Breaks * Breaks * Breaks * Breaks * Fix several runtime breaks (#2515) * Missing files * Runtime breaks * Fix proxy ordering issue * Remove commented code * Fix breaks with opening query editor * Fix post merge break * Updates related to setup build and other breaks (#2516) * Fix bundle build issues * Update distro * Fix distro merge and update build JS files * Disable pipeline steps * Remove stats call * Update license name * Make new RPM dependencies a warning * Fix extension manager version checks * Update JS file * Fix a few runtime breaks * Fixes * Fix runtime issues * Fix build breaks * Update notebook tests (part 1) * Fix broken tests * Linting errors * Fix hygiene * Disable lint rules * Bump distro * Turn off smoke tests * Disable integration tests * Remove failing "activate" test * Remove failed test assertion * Disable other broken test * Disable query history tests * Disable extension unit tests * Disable failing tasks
49 lines
1.6 KiB
TypeScript
49 lines
1.6 KiB
TypeScript
/*---------------------------------------------------------------------------------------------
|
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
|
*--------------------------------------------------------------------------------------------*/
|
|
import * as vscode from 'vscode';
|
|
|
|
export interface IMergeRegion {
|
|
name: string;
|
|
header: vscode.Range;
|
|
content: vscode.Range;
|
|
decoratorContent: vscode.Range;
|
|
}
|
|
|
|
export const enum CommitType {
|
|
Current,
|
|
Incoming,
|
|
Both
|
|
}
|
|
|
|
export interface IExtensionConfiguration {
|
|
enableCodeLens: boolean;
|
|
enableDecorations: boolean;
|
|
enableEditorOverview: boolean;
|
|
}
|
|
|
|
export interface IDocumentMergeConflict extends IDocumentMergeConflictDescriptor {
|
|
commitEdit(type: CommitType, editor: vscode.TextEditor, edit?: vscode.TextEditorEdit): Thenable<boolean>;
|
|
applyEdit(type: CommitType, document: vscode.TextDocument, edit: { replace(range: vscode.Range, newText: string): void }): void;
|
|
}
|
|
|
|
export interface IDocumentMergeConflictDescriptor {
|
|
range: vscode.Range;
|
|
current: IMergeRegion;
|
|
incoming: IMergeRegion;
|
|
commonAncestors: IMergeRegion[];
|
|
splitter: vscode.Range;
|
|
}
|
|
|
|
export interface IDocumentMergeConflictTracker {
|
|
getConflicts(document: vscode.TextDocument): PromiseLike<IDocumentMergeConflict[]>;
|
|
isPending(document: vscode.TextDocument): boolean;
|
|
forget(document: vscode.TextDocument): void;
|
|
}
|
|
|
|
export interface IDocumentMergeConflictTrackerService {
|
|
createTracker(origin: string): IDocumentMergeConflictTracker;
|
|
forget(document: vscode.TextDocument): void;
|
|
}
|