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

Merge vscode 1.67 (#20883)

Browse Source 
* 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
This commit is contained in:
Karl Burtram
2022-10-19 19:13:18 -07:00
committed by GitHub
parent 33c6daaea1
commit 8a3d08f0de
3738 changed files with 192313 additions and 107208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
extensions/notebook/src/book/bookTreeView.ts
View File

@@ -29,7 +29,7 @@ interface BookSearchResults {
bookPaths: string[];
}
export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeItem>, azdata.nb.NavigationProvider, vscode.DragAndDropController<BookTreeItem> {
export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeItem>, azdata.nb.NavigationProvider, vscode.TreeDragAndDropController<BookTreeItem> {
private _onDidChangeTreeData: vscode.EventEmitter<BookTreeItem | undefined> = new vscode.EventEmitter<BookTreeItem | undefined>();
readonly onDidChangeTreeData: vscode.Event<BookTreeItem | undefined> = this._onDidChangeTreeData.event;
private _extensionContext: vscode.ExtensionContext;
@@ -762,23 +762,33 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
return sourcesByBook;
}
async onDrop(sources: vscode.TreeDataTransfer, target: BookTreeItem): Promise<void> {
if (target.contextValue === BookTreeItemType.savedBook || target.contextValue === BookTreeItemType.section) {
sendNotebookActionEvent(NbTelemetryView.Book, NbTelemetryAction.DragAndDrop);
// gets the tree items that are dragged and dropped
let treeItems = JSON.parse(await sources.items.get(this.supportedTypes[0])!.asString()) as BookTreeItem[];
let rootItems = this.getLocalRoots(treeItems);
rootItems = rootItems.filter(item => item.resourceUri !== target.resourceUri);
if (rootItems && target) {
let sourcesByBook = this.groupTreeItemsByBookModel(rootItems);
const targetBook = this.books.find(book => book.bookPath === target.book.root);
for (let [book, items] of sourcesByBook) {
this.bookTocManager = new BookTocManager(book, targetBook);
this.bookTocManager.enableDnd = true;
await this.bookTocManager.updateBook(items, target);
}
}
}
// {{SQL CARBON MERGE TODO}} -- need to reimplement drag-and-drop with current interface
// async onDrop(sources: vscode.TreeDataTransfer, target: BookTreeItem): Promise<void> {
// if (target.contextValue === BookTreeItemType.savedBook || target.contextValue === BookTreeItemType.section) {
// sendNotebookActionEvent(NbTelemetryView.Book, NbTelemetryAction.DragAndDrop);
// // gets the tree items that are dragged and dropped
// let treeItems = JSON.parse(await sources.items.get(this.supportedTypes[0])!.asString()) as BookTreeItem[];
// let rootItems = this.getLocalRoots(treeItems);
// rootItems = rootItems.filter(item => item.resourceUri !== target.resourceUri);
// if (rootItems && target) {
// let sourcesByBook = this.groupTreeItemsByBookModel(rootItems);
// const targetBook = this.books.find(book => book.bookPath === target.book.root);
// for (let [book, items] of sourcesByBook) {
// this.bookTocManager = new BookTocManager(book, targetBook);
// this.bookTocManager.enableDnd = true;
// await this.bookTocManager.updateBook(items, target);
// }
// }
// }
// }
// new dnd interface
readonly dropMimeTypes: readonly string[];
readonly dragMimeTypes: readonly string[];
handleDrag(treeItems: readonly BookTreeItem[], dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Thenable<void> | void {
return undefined; // not implemented
}
handleDrop(target: BookTreeItem | undefined, dataTransfer: vscode.DataTransfer, token: vscode.CancellationToken): Thenable<void> | void {
}
/**

1
extensions/notebook/src/intellisense/text.ts
View File

@@ -11,6 +11,7 @@
// We need to translate cursor_pos in the Jupyter protocol (in characters)
// to js offset (with surrogate pairs taking two spots).
// allow-any-unicode-next-line
const HAS_SURROGATES: boolean = '𝐚'.length > 1;
/**

3
extensions/notebook/src/test/common/stubs.ts
View File

@@ -58,5 +58,8 @@ export class MockOutputChannel implements vscode.OutputChannel {
}
dispose(): void {
}
replace(_value: string): void {
}
}

3
extensions/notebook/src/typings/refs.d.ts vendored
View File

@@ -5,7 +5,6 @@
/// <reference path='../../../../src/sql/azdata.d.ts'/>
/// <reference path='../../../../src/sql/azdata.proposed.d.ts'/>
/// <reference path='../../../../src/vs/vscode.d.ts'/>
/// <reference path='../../../../src/vs/vscode.proposed.d.ts' />
/// <reference path='../../../../src/vscode-dts/vscode.d.ts'/>
/// <reference path='../../../big-data-cluster/src/bdc.d.ts'/>
/// <reference types='@types/node'/>