mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-10 18:22:34 -05:00
Merge VS Code 1.26.1 (#2394)
* Squash merge commits for 1.26 (#1) (#2323) * Polish tag search as per feedback (#55269) * Polish tag search as per feedback * Updated regex * Allow users to opt-out of features that send online requests in the background (#55097) * settings sweep #54690 * Minor css tweaks to enable eoverflow elipsis in more places (#55277) * fix an issue with titlebarheight when not scaling with zoom * Settings descriptions update #54690 * fixes #55209 * Settings editor - many padding fixes * More space above level 2 label * Fixing Cannot debug npm script using Yarn #55103 * Settings editor - show ellipsis when description overflows * Settings editor - ... fix measuring around links, relayout * Setting descriptions * Settings editor - fix ... for some short lines, fix select container width * Settings editor - overlay trees so scrollable shadow is full width * Fix #54133 - missing extension settings after reload * Settings color token description tweak * Settings editor - disable overflow indicator temporarily, needs to be faster * Added command to Run the selected npm script * fixes #54452 * fixes #54929 * fixes #55248 * prefix command with extension name * Contribute run selected to the context menu * node-debug@1.26.6 * Allow terminal rendererType to be swapped out at runtime Part of #53274 Fixes #55344 * Settings editor - fix not focusing search when restoring editor setInput must be actually async. Will be fixed naturally when we aren't using winJS promises... * Settings editor - TOC should only expand the section with a selected item * Bump node-debug2 * Settings editor - Tree focus outlines * Settings editor - don't blink the scrollbar when toc selection changes And hide TOC correctly when the editor is narrow * Settings editor - header rows should not be selectable * fixes #54877 * change debug assignee to isi * Settings sweep (#54690) * workaround for #55051 * Settings sweep (#54690) * settings sweep #54690 * Don't try closing tags when you type > after another > * Describe what implementation code lens does Fixes #55370 * fix javadoc formatter setting description * fixes #55325 * update to officical TS version * Settings editor - Even more padding, use semibold instead of bold * Fix #55357 - fix TOC twistie * fixes #55288 * explorer: refresh on di change file system provider registration fixes #53256 * Disable push to Linux repo to test standalone publisher * New env var to notify log level to extensions #54001 * Disable snippets in extension search (when not in suggest dropdown) (#55281) * Disable snippits in extension search (when not in suggest dropdown) * Add monaco input contributions * Fix bug preventing snippetSuggestions from taking effect in sub-editors * Latest emmet helper to fix #52366 * Fix comment updates for threads within same file * Allow extensions to log telemetry to log files #54001 * Pull latest css grammar * files.exclude control - use same style for "add" vs "edit" * files.exclude control - focus/keyboard behavior * don't show menubar too early * files.exclude - better styling * Place cursor at end of extensions search box on autofill (#55254) * Place cursor at end of extensions search box on autofill * Use position instead of selection * fix linux build issue (empty if block) * Settings editor - fix extension category prefixes * Settings editor - add simple ellipsis for first line that overflows, doesn't cover case when first line does not overflow but there is more text, TODO * File/Text search provider docs * Fixes #52655 * Include epoch (#55008) * Fixes #53385 * Fixes #49480 * VS Code Insiders (Users) not opening Fixes #55353 * Better handling of the case when the extension host fails to start * Fixes #53966 * Remove confusing Start from wordPartLeft commands ID * vscode-xterm@3.6.0-beta12 Fixes #55488 * Initial size is set to infinity!! Fixes #55461 * Polish embeddedEditorBackground * configuration service misses event * Fix #55224 - fix duplicate results in multiroot workspace from splitting the diskseach query * Select all not working in issue reporter on mac, fixes #55424 * Disable fuzzy matching for extensions autosuggest (#55498) * Fix clipping of extensions search border in some third party themes (#55504) * fixes #55538 * Fix bug causing an aria alert to not be shown the third time (and odd numbers thereafter) * Settings editor - work around rendering glitch with webkit-line-clamp * Settings editor - revert earlier '...' changes * Settings editor - move enumDescription to its own div, because it disturbs -webkit-line-clamp for some reason * Settings editor - better overflow indicator * Don't show existing filters in autocomplete (#55495) * Dont show existing filters in autocomplete * Simplify * Settings Editor: Add aria labels for input elements Fixes: #54836 (#55543) * fixes #55223 * Update vscode-css-languageservice to 3.0.10-next.1 * Fix #55509 - settings navigation * Fix #55519 * Fix #55520 * FIx #55524 * Fix #55556 - include wordSeparators in all search queries, so findTextInFiles can respect isWordMatch correctly * oss updates for endgame * Fix unit tests * fixes #55522 * Avoid missing manifest error from bubbling up #54757 * Settings format crawl * Search provider - Fix FileSearchProvider to return array, not progress * Fix #55598 * Settings editor - fix NPE rendering settings with no description * dont render inden guides in search box (#55600) * fixes #55454 * More settings crawl * Another change for #55598 - maxResults applies to FileSearch and TextSearch but not FileIndex * Fix FileSearchProvider unit tests for progress change * fixes #55561 * Settings description update for #54690 * Update setting descriptions for online services * Minor edits * fixes #55513 * fixes #55451 * Fix #55612 - fix findTextInFiles cancellation * fixes #55539 * More setting description tweaks * Setting to disable online experiments #54354 * fixes #55507 * fixes #55515 * Show online services action only in Insiders for now * Settings editor - change toc behavior default to 'filter' * Settings editor - nicer filter count style during search * Fix #55617 - search viewlet icons * Settings editor - better styling for element count indicator * SearchProvider - fix NPE when searching extraFileResources * Allow extends to work without json suffix Fixes #16905 * Remove accessability options logic entirely Follow up on #55451 * use latest version of DAP * fixes #55490 * fixes #55122 * fixes #52332 * Avoid assumptions about git: URIs (fixes #36236) * relative path for descriptions * resourece: get rid of isFile context key fixes #48275 * Register previous ids for compatibility (#53497) * more tuning for #48275 * no need to always re-read "files explorer" fixes #52003 * read out active composites properly fixes #51967 * Update link colors for hc theme to meet color contrast ratio, fixes #55651 Also updated link color for `textLinkActiveForeground` to be the same as `textLinkForeground` as it wasn't properly updated * detect 'winpty-agent.exe'; fixes #55672 * node-debug@1.26.7 * reset counter on new label * Settings editor - fix multiple setting links in one description * Settings editor - color code blocks in setting descriptions, fix #55532 * Settings editor - hover color in TOC * Settings editor - fix navigation NPE * Settings editor - fix text control width * Settings editor - maybe fix #55684 * Fix bug causing cursor to not move on paste * fixes #53582 * Use ctrlCmd instead of ctrl for go down from search box * fixes #55264 * fixes #55456 * filter for spcaes before triggering search (#55611) * Fix #55698 - don't lose filtered TOC counts when refreshing TOC * fixes #55421 * fixes #28979 * fixes #55576 * only add check for updates to windows/linux help * readonly files: append decoration to label fixes #53022 * debug: do not show toolbar while initialising fixes #55026 * Opening launch.json should not activate debug extensions fixes #55029 * fixes #55435 * fixes #55434 * fixes #55439 * trigger menu only on altkey up * Fix #50555 - fix settings editor memory leak * Fix #55712 - no need to focus 'a' anymore when restoring control focus after tree render * fixes #55335 * proper fix for readonly model fixes #53022 * improve FoldingRangeKind spec (for #55686) * Use class with static fields (fixes #55494) * Fixes #53671 * fixes #54630 * [html] should disable ionic suggestions by default. Currently forces deprecated Ionic v1 suggestions in .html files while typing. Fixes #53324 * cleanup deps * debug issues back to andre * update electron for smoketest * Fix #55757 - prevent settings tabs from overflowing * Fix #53897 - revert setting menu defaults to old editor * Add enum descriptions to `typescript.preferences.importModuleSpecifier` * Fix #55767 - leaking style elements from settings editor * Fix #55521 - prevent flashing when clicking in exclude control * Update Git modified color for contrast ratio, fixes #53140 * Revert "Merge branch 'master' of github.com:Microsoft/vscode" This reverts commit bf46b6bfbae0cab99c2863e1244a916181fa9fbc, reversing changes made to e275a424483dfb4ed33b428c97d5e2c441d6b917. * Revert "Revert "Merge branch 'master' of github.com:Microsoft/vscode"" This reverts commit 53949d963f39e40757557c6526332354a31d9154. * don't ask to install an incomplete menu * Fix NPE in terminal AccessibilityManager Fixes #55744 * don't display fallback menu unless we've closed the last window * fixes #55547 * Fix smoke tests for extension search box * Update OSSREADME.json for Electron 2.0.5 * Update distro Includes Chromium license changes * fix #55455 * fix #55865 * fixes #55893 * Fix bug causing workspace recommendations to go away upon ignoring a recommendation (#55805) * Fix bug causing workspace recommendations to go away upon ignoring a recommendation * ONly show on @recommended or @recommended:workspace * Make more consistant * Fix #55911 * Understand json activity (#55926) * Understand json file activity * Refactoring * adding composer.json * Distro update for experiments * use terminal.processId for auto-attach; fixes #55918 * Reject invalid URI with vscode.openFolder (for #55891) * improve win32 setup system vs user detection fixes #55840 fixes #55840 delay winreg import related to #55840 show notification earlier related to #55840 fix #55840 update inno setup message related to #55840 * Fix #55593 - this code only operates on local paths, so use fsPath and Uri.file instead * Bring back the old menu due to electron 2.0 issues (#55913) * add the old menu back for native menus * make menu labels match * `vscode.openFolder`: treat missing URI schema gracefully (for #55891) * delay EH reattach; fixes #55955 * Mark all json files under appSettingsHome as settings * Use localized strings for telemetry opt-out * Exception when saving file editor opened from remote file provider (fixes #55051) * Remove terminal menu from stable Fixes 56003 * VSCode Insiders crashes on open with TypeError: Cannot read property 'lastIndexOf' of undefined. Fixes #54933 * improve fix for #55891 * fix #55916 * Improve #55891 * increase EH debugging restart delay; fixes #55955 * Revert "Don't include non-resource entries in history quick pick" This reverts commit 37209a838e9f7e9abe6dc53ed73cdf1e03b72060. * Diff editor: horizontal scrollbar height is smaller (fixes #56062) * improve openFolder uri fix (correctly treat backslashes) * fixes #56116 repair ipc for native menubar keybindings * Fix #56240 - Open the JSON settings editor instead of the UI editor * Fix #55536 * uriDisplay: if no formatter is registered fall back to getPathlabel fixes #56104 * VSCode hangs when opening python file. Fixes #56377 * VS Code Hangs When Opening Specific PowerShell File. Fixes #56430 * Fix #56433 - search extraFileResources even when no folders open * Workaround #55649 * Fix in master #56371 * Fix tests #56371 * Fix in master #56317 * increase version to 1.26.1 * Fixes #56387: Handle SIGPIPE in extension host * fixes #56185 * Fix merge issues (part 1) * Fix build breaks (part 1) * Build breaks (part 2) * Build breaks (part 3) * More build breaks (part 4) * Fix build breaks (part 5) * WIP * Fix menus * Render query result and message panels (#2363) * Put back query editor hot exit changes * Fix grid changes that broke profiler (#2365) * Update APIs for saving query editor state * Fix restore view state for profiler and edit data * Updating custom default themes to support 4.5:1 contrast ratio * Test updates * Fix Extension Manager and Windows Setup * Update license headers * Add appveyor and travis files back * Fix hidden modal dropdown issue
This commit is contained in:
Karl Burtram
@@ -5,7 +5,7 @@
|
||||
'use strict';
|
||||
|
||||
import { onUnexpectedError } from 'vs/base/common/errors';
|
||||
import { ICursorStateComputer, IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
|
||||
import { ICursorStateComputer, IIdentifiedSingleEditOperation, EndOfLineSequence } from 'vs/editor/common/model';
|
||||
import { Selection } from 'vs/editor/common/core/selection';
|
||||
import { TextModel } from 'vs/editor/common/model/textModel';
|
||||
|
||||
@@ -14,13 +14,86 @@ interface IEditOperation {
|
||||
}
|
||||
|
||||
interface IStackElement {
|
||||
beforeVersionId: number;
|
||||
beforeCursorState: Selection[];
|
||||
readonly beforeVersionId: number;
|
||||
readonly beforeCursorState: Selection[];
|
||||
readonly afterCursorState: Selection[];
|
||||
readonly afterVersionId: number;
|
||||
|
||||
editOperations: IEditOperation[];
|
||||
undo(model: TextModel): void;
|
||||
redo(model: TextModel): void;
|
||||
}
|
||||
|
||||
afterCursorState: Selection[];
|
||||
afterVersionId: number;
|
||||
class EditStackElement implements IStackElement {
|
||||
public readonly beforeVersionId: number;
|
||||
public readonly beforeCursorState: Selection[];
|
||||
public afterCursorState: Selection[];
|
||||
public afterVersionId: number;
|
||||
|
||||
public editOperations: IEditOperation[];
|
||||
|
||||
constructor(beforeVersionId: number, beforeCursorState: Selection[]) {
|
||||
this.beforeVersionId = beforeVersionId;
|
||||
this.beforeCursorState = beforeCursorState;
|
||||
this.afterCursorState = null;
|
||||
this.afterVersionId = -1;
|
||||
this.editOperations = [];
|
||||
}
|
||||
|
||||
public undo(model: TextModel): void {
|
||||
// Apply all operations in reverse order
|
||||
for (let i = this.editOperations.length - 1; i >= 0; i--) {
|
||||
this.editOperations[i] = {
|
||||
operations: model.applyEdits(this.editOperations[i].operations)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
public redo(model: TextModel): void {
|
||||
// Apply all operations
|
||||
for (let i = 0; i < this.editOperations.length; i++) {
|
||||
this.editOperations[i] = {
|
||||
operations: model.applyEdits(this.editOperations[i].operations)
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getModelEOL(model: TextModel): EndOfLineSequence {
|
||||
const eol = model.getEOL();
|
||||
if (eol === '\n') {
|
||||
return EndOfLineSequence.LF;
|
||||
} else {
|
||||
return EndOfLineSequence.CRLF;
|
||||
}
|
||||
}
|
||||
|
||||
class EOLStackElement implements IStackElement {
|
||||
public readonly beforeVersionId: number;
|
||||
public readonly beforeCursorState: Selection[];
|
||||
public readonly afterCursorState: Selection[];
|
||||
public afterVersionId: number;
|
||||
|
||||
public eol: EndOfLineSequence;
|
||||
|
||||
constructor(beforeVersionId: number, setEOL: EndOfLineSequence) {
|
||||
this.beforeVersionId = beforeVersionId;
|
||||
this.beforeCursorState = null;
|
||||
this.afterCursorState = null;
|
||||
this.afterVersionId = -1;
|
||||
this.eol = setEOL;
|
||||
}
|
||||
|
||||
public undo(model: TextModel): void {
|
||||
let redoEOL = getModelEOL(model);
|
||||
model.setEOL(this.eol);
|
||||
this.eol = redoEOL;
|
||||
}
|
||||
|
||||
public redo(model: TextModel): void {
|
||||
let undoEOL = getModelEOL(model);
|
||||
model.setEOL(this.eol);
|
||||
this.eol = undoEOL;
|
||||
}
|
||||
}
|
||||
|
||||
export interface IUndoRedoResult {
|
||||
@@ -55,34 +128,60 @@ export class EditStack {
|
||||
this.future = [];
|
||||
}
|
||||
|
||||
public pushEOL(eol: EndOfLineSequence): void {
|
||||
// No support for parallel universes :(
|
||||
this.future = [];
|
||||
|
||||
if (this.currentOpenStackElement) {
|
||||
this.pushStackElement();
|
||||
}
|
||||
|
||||
const prevEOL = getModelEOL(this.model);
|
||||
let stackElement = new EOLStackElement(this.model.getAlternativeVersionId(), prevEOL);
|
||||
|
||||
this.model.setEOL(eol);
|
||||
|
||||
stackElement.afterVersionId = this.model.getVersionId();
|
||||
this.currentOpenStackElement = stackElement;
|
||||
this.pushStackElement();
|
||||
}
|
||||
|
||||
public pushEditOperation(beforeCursorState: Selection[], editOperations: IIdentifiedSingleEditOperation[], cursorStateComputer: ICursorStateComputer): Selection[] {
|
||||
// No support for parallel universes :(
|
||||
this.future = [];
|
||||
|
||||
let stackElement: EditStackElement = null;
|
||||
|
||||
if (this.currentOpenStackElement) {
|
||||
if (this.currentOpenStackElement instanceof EditStackElement) {
|
||||
stackElement = this.currentOpenStackElement;
|
||||
} else {
|
||||
this.pushStackElement();
|
||||
}
|
||||
}
|
||||
|
||||
if (!this.currentOpenStackElement) {
|
||||
this.currentOpenStackElement = {
|
||||
beforeVersionId: this.model.getAlternativeVersionId(),
|
||||
beforeCursorState: beforeCursorState,
|
||||
editOperations: [],
|
||||
afterCursorState: null,
|
||||
afterVersionId: -1
|
||||
};
|
||||
stackElement = new EditStackElement(this.model.getAlternativeVersionId(), beforeCursorState);
|
||||
this.currentOpenStackElement = stackElement;
|
||||
}
|
||||
|
||||
const inverseEditOperation: IEditOperation = {
|
||||
operations: this.model.applyEdits(editOperations)
|
||||
};
|
||||
|
||||
this.currentOpenStackElement.editOperations.push(inverseEditOperation);
|
||||
stackElement.editOperations.push(inverseEditOperation);
|
||||
stackElement.afterCursorState = EditStack._computeCursorState(cursorStateComputer, inverseEditOperation.operations);
|
||||
stackElement.afterVersionId = this.model.getVersionId();
|
||||
return stackElement.afterCursorState;
|
||||
}
|
||||
|
||||
private static _computeCursorState(cursorStateComputer: ICursorStateComputer, inverseEditOperations: IIdentifiedSingleEditOperation[]): Selection[] {
|
||||
try {
|
||||
this.currentOpenStackElement.afterCursorState = cursorStateComputer ? cursorStateComputer(inverseEditOperation.operations) : null;
|
||||
return cursorStateComputer ? cursorStateComputer(inverseEditOperations) : null;
|
||||
} catch (e) {
|
||||
onUnexpectedError(e);
|
||||
this.currentOpenStackElement.afterCursorState = null;
|
||||
return null;
|
||||
}
|
||||
|
||||
this.currentOpenStackElement.afterVersionId = this.model.getVersionId();
|
||||
return this.currentOpenStackElement.afterCursorState;
|
||||
}
|
||||
|
||||
public undo(): IUndoRedoResult {
|
||||
@@ -93,13 +192,9 @@ export class EditStack {
|
||||
const pastStackElement = this.past.pop();
|
||||
|
||||
try {
|
||||
// Apply all operations in reverse order
|
||||
for (let i = pastStackElement.editOperations.length - 1; i >= 0; i--) {
|
||||
pastStackElement.editOperations[i] = {
|
||||
operations: this.model.applyEdits(pastStackElement.editOperations[i].operations)
|
||||
};
|
||||
}
|
||||
pastStackElement.undo(this.model);
|
||||
} catch (e) {
|
||||
onUnexpectedError(e);
|
||||
this.clear();
|
||||
return null;
|
||||
}
|
||||
@@ -115,23 +210,19 @@ export class EditStack {
|
||||
return null;
|
||||
}
|
||||
|
||||
public canUndo(): boolean {
|
||||
return (this.past.length > 0);
|
||||
}
|
||||
|
||||
public redo(): IUndoRedoResult {
|
||||
|
||||
if (this.future.length > 0) {
|
||||
if (this.currentOpenStackElement) {
|
||||
throw new Error('How is this possible?');
|
||||
}
|
||||
|
||||
const futureStackElement = this.future.pop();
|
||||
|
||||
try {
|
||||
// Apply all operations
|
||||
for (let i = 0; i < futureStackElement.editOperations.length; i++) {
|
||||
futureStackElement.editOperations[i] = {
|
||||
operations: this.model.applyEdits(futureStackElement.editOperations[i].operations)
|
||||
};
|
||||
}
|
||||
futureStackElement.redo(this.model);
|
||||
} catch (e) {
|
||||
onUnexpectedError(e);
|
||||
this.clear();
|
||||
return null;
|
||||
}
|
||||
@@ -146,4 +237,8 @@ export class EditStack {
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public canRedo(): boolean {
|
||||
return (this.future.length > 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -99,21 +99,17 @@ export function guessIndentation(source: ITextBuffer, defaultTabSize: number, de
|
||||
for (let lineNumber = 1; lineNumber <= linesCount; lineNumber++) {
|
||||
let currentLineLength = source.getLineLength(lineNumber);
|
||||
let currentLineText = source.getLineContent(lineNumber);
|
||||
let charCodeAt: (offset: number) => number;
|
||||
if (currentLineLength > 65536) {
|
||||
// if the text buffer is chunk based, so long lines are cons-string, v8 will flattern the string when we check charCode.
|
||||
// checking charCode on chunks directly is cheaper.
|
||||
charCodeAt = (offset: number) => source.getLineCharCode(lineNumber, offset);
|
||||
} else {
|
||||
charCodeAt = (offset: number) => currentLineText.charCodeAt(offset);
|
||||
}
|
||||
|
||||
// if the text buffer is chunk based, so long lines are cons-string, v8 will flattern the string when we check charCode.
|
||||
// checking charCode on chunks directly is cheaper.
|
||||
const useCurrentLineText = (currentLineLength <= 65536);
|
||||
|
||||
let currentLineHasContent = false; // does `currentLineText` contain non-whitespace chars
|
||||
let currentLineIndentation = 0; // index at which `currentLineText` contains the first non-whitespace char
|
||||
let currentLineSpacesCount = 0; // count of spaces found in `currentLineText` indentation
|
||||
let currentLineTabsCount = 0; // count of tabs found in `currentLineText` indentation
|
||||
for (let j = 0, lenJ = currentLineLength; j < lenJ; j++) {
|
||||
let charCode = charCodeAt(j);
|
||||
let charCode = (useCurrentLineText ? currentLineText.charCodeAt(j) : source.getLineCharCode(lineNumber, j));
|
||||
|
||||
if (charCode === CharCode.Tab) {
|
||||
currentLineTabsCount++;
|
||||
@@ -147,12 +143,6 @@ export function guessIndentation(source: ITextBuffer, defaultTabSize: number, de
|
||||
previousLineIndentation = currentLineIndentation;
|
||||
}
|
||||
|
||||
// Take into account the last line as well
|
||||
let deltaSpacesCount = spacesDiff(previousLineText, previousLineIndentation, '', 0);
|
||||
if (deltaSpacesCount <= MAX_ALLOWED_TAB_SIZE_GUESS) {
|
||||
spacesDiffCount[deltaSpacesCount]++;
|
||||
}
|
||||
|
||||
let insertSpaces = defaultInsertSpaces;
|
||||
if (linesIndentedWithTabsCount !== linesIndentedWithSpacesCount) {
|
||||
insertSpaces = (linesIndentedWithTabsCount < linesIndentedWithSpacesCount);
|
||||
|
||||
@@ -6,18 +6,20 @@
|
||||
|
||||
import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
|
||||
import { Range } from 'vs/editor/common/core/range';
|
||||
import { IModelDecoration } from 'vs/editor/common/model';
|
||||
import { IModelDecoration, TrackedRangeStickiness as ActualTrackedRangeStickiness } from 'vs/editor/common/model';
|
||||
|
||||
//
|
||||
// The red-black tree is based on the "Introduction to Algorithms" by Cormen, Leiserson and Rivest.
|
||||
//
|
||||
|
||||
export const ClassName = {
|
||||
EditorHintDecoration: 'squiggly-hint',
|
||||
EditorInfoDecoration: 'squiggly-info',
|
||||
EditorWarningDecoration: 'squiggly-warning',
|
||||
EditorErrorDecoration: 'squiggly-error'
|
||||
};
|
||||
export const enum ClassName {
|
||||
EditorHintDecoration = 'squiggly-hint',
|
||||
EditorInfoDecoration = 'squiggly-info',
|
||||
EditorWarningDecoration = 'squiggly-warning',
|
||||
EditorErrorDecoration = 'squiggly-error',
|
||||
EditorUnnecessaryDecoration = 'squiggly-unnecessary',
|
||||
EditorUnnecessaryInlineDecoration = 'squiggly-inline-unnecessary'
|
||||
}
|
||||
|
||||
/**
|
||||
* Describes the behavior of decorations when typing/editing near their edges.
|
||||
@@ -114,11 +116,14 @@ function setNodeIsInOverviewRuler(node: IntervalNode, value: boolean): void {
|
||||
function getNodeStickiness(node: IntervalNode): TrackedRangeStickiness {
|
||||
return ((node.metadata & Constants.StickinessMask) >>> Constants.StickinessOffset);
|
||||
}
|
||||
function setNodeStickiness(node: IntervalNode, stickiness: TrackedRangeStickiness): void {
|
||||
function _setNodeStickiness(node: IntervalNode, stickiness: TrackedRangeStickiness): void {
|
||||
node.metadata = (
|
||||
(node.metadata & Constants.StickinessMaskInverse) | (stickiness << Constants.StickinessOffset)
|
||||
);
|
||||
}
|
||||
export function setNodeStickiness(node: IntervalNode, stickiness: ActualTrackedRangeStickiness): void {
|
||||
_setNodeStickiness(node, <number>stickiness);
|
||||
}
|
||||
|
||||
export class IntervalNode implements IModelDecoration {
|
||||
|
||||
@@ -163,7 +168,7 @@ export class IntervalNode implements IModelDecoration {
|
||||
this.ownerId = 0;
|
||||
this.options = null;
|
||||
setNodeIsForValidation(this, false);
|
||||
setNodeStickiness(this, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
|
||||
_setNodeStickiness(this, TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges);
|
||||
setNodeIsInOverviewRuler(this, false);
|
||||
|
||||
this.cachedVersionId = 0;
|
||||
@@ -192,7 +197,7 @@ export class IntervalNode implements IModelDecoration {
|
||||
|| className === ClassName.EditorWarningDecoration
|
||||
|| className === ClassName.EditorInfoDecoration
|
||||
));
|
||||
setNodeStickiness(this, <number>this.options.stickiness);
|
||||
_setNodeStickiness(this, <number>this.options.stickiness);
|
||||
setNodeIsInOverviewRuler(this, this.options.overviewRuler.color ? true : false);
|
||||
}
|
||||
|
||||
@@ -391,7 +396,7 @@ function adjustMarkerBeforeColumn(markerOffset: number, markerStickToPreviousCha
|
||||
* This is a lot more complicated than strictly necessary to maintain the same behaviour
|
||||
* as when decorations were implemented using two markers.
|
||||
*/
|
||||
function nodeAcceptEdit(node: IntervalNode, start: number, end: number, textLength: number, forceMoveMarkers: boolean): void {
|
||||
export function nodeAcceptEdit(node: IntervalNode, start: number, end: number, textLength: number, forceMoveMarkers: boolean): void {
|
||||
const nodeStickiness = getNodeStickiness(node);
|
||||
const startStickToPreviousCharacter = (
|
||||
nodeStickiness === TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges
|
||||
|
||||
@@ -517,7 +517,7 @@ export class PieceTreeBase {
|
||||
return this._lineCnt;
|
||||
}
|
||||
|
||||
public getLineContent(lineNumber): string {
|
||||
public getLineContent(lineNumber: number): string {
|
||||
if (this._lastVisitedLine.lineNumber === lineNumber) {
|
||||
return this._lastVisitedLine.value;
|
||||
}
|
||||
|
||||
@@ -78,17 +78,17 @@ export class TreeNode {
|
||||
}
|
||||
}
|
||||
|
||||
export const enum NodeColor {
|
||||
Black = 0,
|
||||
Red = 1,
|
||||
}
|
||||
|
||||
export const SENTINEL: TreeNode = new TreeNode(null, NodeColor.Black);
|
||||
SENTINEL.parent = SENTINEL;
|
||||
SENTINEL.left = SENTINEL;
|
||||
SENTINEL.right = SENTINEL;
|
||||
SENTINEL.color = NodeColor.Black;
|
||||
|
||||
export const enum NodeColor {
|
||||
Black = 0,
|
||||
Red = 1,
|
||||
}
|
||||
|
||||
export function leftest(node: TreeNode): TreeNode {
|
||||
while (node.left !== SENTINEL) {
|
||||
node = node.left;
|
||||
|
||||
@@ -46,7 +46,7 @@ export function createTextBufferFactory(text: string): model.ITextBufferFactory
|
||||
}
|
||||
|
||||
export function createTextBufferFactoryFromStream(stream: IStringStream, filter?: (chunk: string) => string): TPromise<model.ITextBufferFactory> {
|
||||
return new TPromise<model.ITextBufferFactory>((c, e, p) => {
|
||||
return new TPromise<model.ITextBufferFactory>((c, e) => {
|
||||
let done = false;
|
||||
let builder = createTextBufferBuilder();
|
||||
|
||||
@@ -898,6 +898,9 @@ export class TextModel extends Disposable implements model.ITextModel {
|
||||
* @param strict Do NOT allow a position inside a high-low surrogate pair
|
||||
*/
|
||||
private _isValidPosition(lineNumber: number, column: number, strict: boolean): boolean {
|
||||
if (isNaN(lineNumber)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (lineNumber < 1) {
|
||||
return false;
|
||||
@@ -908,6 +911,10 @@ export class TextModel extends Disposable implements model.ITextModel {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (isNaN(column)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (column < 1) {
|
||||
return false;
|
||||
}
|
||||
@@ -933,8 +940,8 @@ export class TextModel extends Disposable implements model.ITextModel {
|
||||
* @param strict Do NOT allow a position inside a high-low surrogate pair
|
||||
*/
|
||||
private _validatePosition(_lineNumber: number, _column: number, strict: boolean): Position {
|
||||
const lineNumber = Math.floor(typeof _lineNumber === 'number' ? _lineNumber : 1);
|
||||
const column = Math.floor(typeof _column === 'number' ? _column : 1);
|
||||
const lineNumber = Math.floor((typeof _lineNumber === 'number' && !isNaN(_lineNumber)) ? _lineNumber : 1);
|
||||
const column = Math.floor((typeof _column === 'number' && !isNaN(_column)) ? _column : 1);
|
||||
const lineCount = this._buffer.getLineCount();
|
||||
|
||||
if (lineNumber < 1) {
|
||||
@@ -1143,6 +1150,21 @@ export class TextModel extends Disposable implements model.ITextModel {
|
||||
this._commandManager.pushStackElement();
|
||||
}
|
||||
|
||||
public pushEOL(eol: model.EndOfLineSequence): void {
|
||||
const currentEOL = (this.getEOL() === '\n' ? model.EndOfLineSequence.LF : model.EndOfLineSequence.CRLF);
|
||||
if (currentEOL === eol) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
this._onDidChangeDecorations.beginDeferredEmit();
|
||||
this._eventEmitter.beginDeferredEmit();
|
||||
this._commandManager.pushEOL(eol);
|
||||
} finally {
|
||||
this._eventEmitter.endDeferredEmit();
|
||||
this._onDidChangeDecorations.endDeferredEmit();
|
||||
}
|
||||
}
|
||||
|
||||
public pushEditOperations(beforeCursorState: Selection[], editOperations: model.IIdentifiedSingleEditOperation[], cursorStateComputer: model.ICursorStateComputer): Selection[] {
|
||||
try {
|
||||
this._onDidChangeDecorations.beginDeferredEmit();
|
||||
@@ -1213,6 +1235,14 @@ export class TextModel extends Disposable implements model.ITextModel {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (
|
||||
trimLineNumber === editRange.startLineNumber && editRange.startColumn === 1
|
||||
&& editRange.isEmpty() && editText && editText.length > 0 && editText.charAt(editText.length - 1) === '\n'
|
||||
) {
|
||||
// This edit inserts a new line (and maybe other text) before `trimLine`
|
||||
continue;
|
||||
}
|
||||
|
||||
// Looks like we can't trim this line as it would interfere with an incoming edit
|
||||
allowTrimLine = false;
|
||||
break;
|
||||
@@ -1386,6 +1416,10 @@ export class TextModel extends Disposable implements model.ITextModel {
|
||||
}
|
||||
}
|
||||
|
||||
public canUndo(): boolean {
|
||||
return this._commandManager.canUndo();
|
||||
}
|
||||
|
||||
private _redo(): Selection[] {
|
||||
this._isRedoing = true;
|
||||
let r = this._commandManager.redo();
|
||||
@@ -1411,6 +1445,10 @@ export class TextModel extends Disposable implements model.ITextModel {
|
||||
}
|
||||
}
|
||||
|
||||
public canRedo(): boolean {
|
||||
return this._commandManager.canRedo();
|
||||
}
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Decorations
|
||||
@@ -2482,10 +2520,10 @@ export class TextModel extends Disposable implements model.ITextModel {
|
||||
const upLineNumber = lineNumber - distance;
|
||||
const downLineNumber = lineNumber + distance;
|
||||
|
||||
if (upLineNumber < 1 || upLineNumber < minLineNumber) {
|
||||
if (distance !== 0 && (upLineNumber < 1 || upLineNumber < minLineNumber)) {
|
||||
goUp = false;
|
||||
}
|
||||
if (downLineNumber > lineCount || downLineNumber > maxLineNumber) {
|
||||
if (distance !== 0 && (downLineNumber > lineCount || downLineNumber > maxLineNumber)) {
|
||||
goDown = false;
|
||||
}
|
||||
if (distance > 50000) {
|
||||
@@ -2734,7 +2772,7 @@ class DecorationsTrees {
|
||||
}
|
||||
|
||||
function cleanClassName(className: string): string {
|
||||
return className.replace(/[^a-z0-9\-]/gi, ' ');
|
||||
return className.replace(/[^a-z0-9\-_]/gi, ' ');
|
||||
}
|
||||
|
||||
export class ModelDecorationOverviewRulerOptions implements model.IModelDecorationOverviewRulerOptions {
|
||||
|
||||
@@ -127,6 +127,55 @@ export function createFindMatch(range: Range, rawMatches: RegExpExecArray, captu
|
||||
return new FindMatch(range, matches);
|
||||
}
|
||||
|
||||
class LineFeedCounter {
|
||||
|
||||
private readonly _lineFeedsOffsets: number[];
|
||||
|
||||
constructor(text: string) {
|
||||
let lineFeedsOffsets: number[] = [];
|
||||
let lineFeedsOffsetsLen = 0;
|
||||
for (let i = 0, textLen = text.length; i < textLen; i++) {
|
||||
if (text.charCodeAt(i) === CharCode.LineFeed) {
|
||||
lineFeedsOffsets[lineFeedsOffsetsLen++] = i;
|
||||
}
|
||||
}
|
||||
this._lineFeedsOffsets = lineFeedsOffsets;
|
||||
}
|
||||
|
||||
public findLineFeedCountBeforeOffset(offset: number): number {
|
||||
const lineFeedsOffsets = this._lineFeedsOffsets;
|
||||
let min = 0;
|
||||
let max = lineFeedsOffsets.length - 1;
|
||||
|
||||
if (max === -1) {
|
||||
// no line feeds
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (offset <= lineFeedsOffsets[0]) {
|
||||
// before first line feed
|
||||
return 0;
|
||||
}
|
||||
|
||||
while (min < max) {
|
||||
const mid = min + ((max - min) / 2 >> 0);
|
||||
|
||||
if (lineFeedsOffsets[mid] >= offset) {
|
||||
max = mid - 1;
|
||||
} else {
|
||||
if (lineFeedsOffsets[mid + 1] >= offset) {
|
||||
// bingo!
|
||||
min = mid;
|
||||
max = mid;
|
||||
} else {
|
||||
min = mid + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
return min + 1;
|
||||
}
|
||||
}
|
||||
|
||||
export class TextModelSearch {
|
||||
|
||||
public static findMatches(model: TextModel, searchParams: SearchParams, searchRange: Range, captureMatches: boolean, limitResultCount: number): FindMatch[] {
|
||||
@@ -136,23 +185,6 @@ export class TextModelSearch {
|
||||
}
|
||||
|
||||
if (searchData.regex.multiline) {
|
||||
if (searchData.regex.source === '\\n') {
|
||||
// Fast path for searching for EOL
|
||||
let result: FindMatch[] = [], resultLen = 0;
|
||||
for (let lineNumber = 1, lineCount = model.getLineCount(); lineNumber < lineCount; lineNumber++) {
|
||||
const range = new Range(lineNumber, model.getLineMaxColumn(lineNumber), lineNumber + 1, 1);
|
||||
if (captureMatches) {
|
||||
result[resultLen++] = new FindMatch(range, null);
|
||||
} else {
|
||||
result[resultLen++] = new FindMatch(range, ['\n']);
|
||||
}
|
||||
|
||||
if (resultLen >= limitResultCount) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
return this._doFindMatchesMultiline(model, searchRange, new Searcher(searchData.wordSeparators, searchData.regex), captureMatches, limitResultCount);
|
||||
}
|
||||
return this._doFindMatchesLineByLine(model, searchRange, searchData, captureMatches, limitResultCount);
|
||||
@@ -162,16 +194,11 @@ export class TextModelSearch {
|
||||
* Multiline search always executes on the lines concatenated with \n.
|
||||
* We must therefore compensate for the count of \n in case the model is CRLF
|
||||
*/
|
||||
private static _getMultilineMatchRange(model: TextModel, deltaOffset: number, text: string, matchIndex: number, match0: string): Range {
|
||||
private static _getMultilineMatchRange(model: TextModel, deltaOffset: number, text: string, lfCounter: LineFeedCounter, matchIndex: number, match0: string): Range {
|
||||
let startOffset: number;
|
||||
let lineFeedCountBeforeMatch = 0;
|
||||
if (model.getEOL() === '\r\n') {
|
||||
let lineFeedCountBeforeMatch = 0;
|
||||
for (let i = 0; i < matchIndex; i++) {
|
||||
let chCode = text.charCodeAt(i);
|
||||
if (chCode === CharCode.LineFeed) {
|
||||
lineFeedCountBeforeMatch++;
|
||||
}
|
||||
}
|
||||
lineFeedCountBeforeMatch = lfCounter.findLineFeedCountBeforeOffset(matchIndex);
|
||||
startOffset = deltaOffset + matchIndex + lineFeedCountBeforeMatch /* add as many \r as there were \n */;
|
||||
} else {
|
||||
startOffset = deltaOffset + matchIndex;
|
||||
@@ -179,13 +206,8 @@ export class TextModelSearch {
|
||||
|
||||
let endOffset: number;
|
||||
if (model.getEOL() === '\r\n') {
|
||||
let lineFeedCountInMatch = 0;
|
||||
for (let i = 0, len = match0.length; i < len; i++) {
|
||||
let chCode = text.charCodeAt(i + matchIndex);
|
||||
if (chCode === CharCode.LineFeed) {
|
||||
lineFeedCountInMatch++;
|
||||
}
|
||||
}
|
||||
let lineFeedCountBeforeEndOfMatch = lfCounter.findLineFeedCountBeforeOffset(matchIndex + match0.length);
|
||||
let lineFeedCountInMatch = lineFeedCountBeforeEndOfMatch - lineFeedCountBeforeMatch;
|
||||
endOffset = startOffset + match0.length + lineFeedCountInMatch /* add as many \r as there were \n */;
|
||||
} else {
|
||||
endOffset = startOffset + match0.length;
|
||||
@@ -202,6 +224,7 @@ export class TextModelSearch {
|
||||
// This makes it that \n will match the EOL for both CRLF and LF models
|
||||
// We compensate for offset errors in `_getMultilineMatchRange`
|
||||
const text = model.getValueInRange(searchRange, EndOfLinePreference.LF);
|
||||
const lfCounter = (model.getEOL() === '\r\n' ? new LineFeedCounter(text) : null);
|
||||
|
||||
const result: FindMatch[] = [];
|
||||
let counter = 0;
|
||||
@@ -209,7 +232,7 @@ export class TextModelSearch {
|
||||
let m: RegExpExecArray;
|
||||
searcher.reset(0);
|
||||
while ((m = searcher.next(text))) {
|
||||
result[counter++] = createFindMatch(this._getMultilineMatchRange(model, deltaOffset, text, m.index, m[0]), m, captureMatches);
|
||||
result[counter++] = createFindMatch(this._getMultilineMatchRange(model, deltaOffset, text, lfCounter, m.index, m[0]), m, captureMatches);
|
||||
if (counter >= limitResultCount) {
|
||||
return result;
|
||||
}
|
||||
@@ -304,11 +327,12 @@ export class TextModelSearch {
|
||||
// This makes it that \n will match the EOL for both CRLF and LF models
|
||||
// We compensate for offset errors in `_getMultilineMatchRange`
|
||||
const text = model.getValueInRange(new Range(searchTextStart.lineNumber, searchTextStart.column, lineCount, model.getLineMaxColumn(lineCount)), EndOfLinePreference.LF);
|
||||
const lfCounter = (model.getEOL() === '\r\n' ? new LineFeedCounter(text) : null);
|
||||
searcher.reset(searchStart.column - 1);
|
||||
let m = searcher.next(text);
|
||||
if (m) {
|
||||
return createFindMatch(
|
||||
this._getMultilineMatchRange(model, deltaOffset, text, m.index, m[0]),
|
||||
this._getMultilineMatchRange(model, deltaOffset, text, lfCounter, m.index, m[0]),
|
||||
m,
|
||||
captureMatches
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user