ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-29 09:35:38 -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

51
extensions/markdown-language-features/preview-src/scroll-sync.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { getSettings } from './settings';
import { SettingsManager } from './settings';
const codeLineClass = 'code-line';
@@ -11,8 +11,8 @@ function clamp(min: number, max: number, value: number) {
return Math.min(max, Math.max(min, value));
}
function clampLine(line: number) {
return clamp(0, getSettings().lineCount - 1, line);
function clampLine(line: number, lineCount: number) {
return clamp(0, lineCount - 1, line);
}
@@ -22,10 +22,12 @@ export interface CodeLineElement {
}
const getCodeLineElements = (() => {
let elements: CodeLineElement[];
return () => {
if (!elements) {
elements = [{ element: document.body, line: 0 }];
let cachedElements: CodeLineElement[] | undefined;
let cachedVersion = -1;
return (documentVersion: number) => {
if (!cachedElements || documentVersion !== cachedVersion) {
cachedVersion = documentVersion;
cachedElements = [{ element: document.body, line: 0 }];
for (const element of document.getElementsByClassName(codeLineClass)) {
const line = +element.getAttribute('data-line')!;
if (isNaN(line)) {
@@ -35,13 +37,13 @@ const getCodeLineElements = (() => {
if (element.tagName === 'CODE' && element.parentElement && element.parentElement.tagName === 'PRE') {
// Fenched code blocks are a special case since the `code-line` can only be marked on
// the `<code>` element and not the parent `<pre>` element.
elements.push({ element: element.parentElement as HTMLElement, line });
cachedElements.push({ element: element.parentElement as HTMLElement, line });
} else {
elements.push({ element: element as HTMLElement, line });
cachedElements.push({ element: element as HTMLElement, line });
}
}
}
return elements;
return cachedElements;
};
})();
@@ -51,9 +53,9 @@ const getCodeLineElements = (() => {
* If an exact match, returns a single element. If the line is between elements,
* returns the element prior to and the element after the given line.
*/
export function getElementsForSourceLine(targetLine: number): { previous: CodeLineElement; next?: CodeLineElement; } {
export function getElementsForSourceLine(targetLine: number, documentVersion: number): { previous: CodeLineElement; next?: CodeLineElement } {
const lineNumber = Math.floor(targetLine);
const lines = getCodeLineElements();
const lines = getCodeLineElements(documentVersion);
let previous = lines[0] || null;
for (const entry of lines) {
if (entry.line === lineNumber) {
@@ -69,8 +71,8 @@ export function getElementsForSourceLine(targetLine: number): { previous: CodeLi
/**
* Find the html elements that are at a specific pixel offset on the page.
*/
export function getLineElementsAtPageOffset(offset: number): { previous: CodeLineElement; next?: CodeLineElement; } {
const lines = getCodeLineElements();
export function getLineElementsAtPageOffset(offset: number, documentVersion: number): { previous: CodeLineElement; next?: CodeLineElement } {
const lines = getCodeLineElements(documentVersion);
const position = offset - window.scrollY;
let lo = -1;
let hi = lines.length - 1;
@@ -96,7 +98,7 @@ export function getLineElementsAtPageOffset(offset: number): { previous: CodeLin
return { previous: hiElement };
}
function getElementBounds({ element }: CodeLineElement): { top: number, height: number } {
function getElementBounds({ element }: CodeLineElement): { top: number; height: number } {
const myBounds = element.getBoundingClientRect();
// Some code line elements may contain other code line elements.
@@ -117,8 +119,8 @@ function getElementBounds({ element }: CodeLineElement): { top: number, height:
/**
* Attempt to reveal the element for a source line in the editor.
*/
export function scrollToRevealSourceLine(line: number) {
if (!getSettings().scrollPreviewWithEditor) {
export function scrollToRevealSourceLine(line: number, documentVersion: number, settingsManager: SettingsManager) {
if (!settingsManager.settings?.scrollPreviewWithEditor) {
return;
}
@@ -127,7 +129,7 @@ export function scrollToRevealSourceLine(line: number) {
return;
}
const { previous, next } = getElementsForSourceLine(line);
const { previous, next } = getElementsForSourceLine(line, documentVersion);
if (!previous) {
return;
}
@@ -147,19 +149,20 @@ export function scrollToRevealSourceLine(line: number) {
window.scroll(window.scrollX, Math.max(1, window.scrollY + scrollTo));
}
export function getEditorLineNumberForPageOffset(offset: number) {
const { previous, next } = getLineElementsAtPageOffset(offset);
export function getEditorLineNumberForPageOffset(offset: number, documentVersion: number, settingsManager: SettingsManager) {
const lineCount = settingsManager.settings?.lineCount ?? 0;
const { previous, next } = getLineElementsAtPageOffset(offset, documentVersion);
if (previous) {
const previousBounds = getElementBounds(previous);
const offsetFromPrevious = (offset - window.scrollY - previousBounds.top);
if (next) {
const progressBetweenElements = offsetFromPrevious / (getElementBounds(next).top - previousBounds.top);
const line = previous.line + progressBetweenElements * (next.line - previous.line);
return clampLine(line);
return clampLine(line, lineCount);
} else {
const progressWithinElement = offsetFromPrevious / (previousBounds.height);
const line = previous.line + progressWithinElement;
return clampLine(line);
return clampLine(line, lineCount);
}
}
return null;
@@ -168,8 +171,8 @@ export function getEditorLineNumberForPageOffset(offset: number) {
/**
* Try to find the html element by using a fragment id
*/
export function getLineElementForFragment(fragment: string): CodeLineElement | undefined {
return getCodeLineElements().find((element) => {
export function getLineElementForFragment(fragment: string, documentVersion: number): CodeLineElement | undefined {
return getCodeLineElements(documentVersion).find((element) => {
return element.element.id === fragment;
});
}