mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-10 10:12: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
@@ -874,16 +874,16 @@ suite('Editor Commands - ShiftCommand', () => {
|
||||
|
||||
test('bug #16815:Shift+Tab doesn\'t go back to tabstop', () => {
|
||||
|
||||
var repeatStr = (str: string, cnt: number): string => {
|
||||
var r = '';
|
||||
for (var i = 0; i < cnt; i++) {
|
||||
let repeatStr = (str: string, cnt: number): string => {
|
||||
let r = '';
|
||||
for (let i = 0; i < cnt; i++) {
|
||||
r += str;
|
||||
}
|
||||
return r;
|
||||
};
|
||||
|
||||
var testOutdent = (tabSize: number, oneIndent: string, lineText: string, expectedIndents: number) => {
|
||||
var expectedIndent = repeatStr(oneIndent, expectedIndents);
|
||||
let testOutdent = (tabSize: number, oneIndent: string, lineText: string, expectedIndents: number) => {
|
||||
let expectedIndent = repeatStr(oneIndent, expectedIndents);
|
||||
if (lineText.length > 0) {
|
||||
_assertUnshiftCommand(tabSize, oneIndent, [lineText + 'aaa'], [createSingleEditOp(expectedIndent, 1, 1, 1, lineText.length + 1)]);
|
||||
} else {
|
||||
@@ -891,14 +891,14 @@ suite('Editor Commands - ShiftCommand', () => {
|
||||
}
|
||||
};
|
||||
|
||||
var testIndent = (tabSize: number, oneIndent: string, lineText: string, expectedIndents: number) => {
|
||||
var expectedIndent = repeatStr(oneIndent, expectedIndents);
|
||||
let testIndent = (tabSize: number, oneIndent: string, lineText: string, expectedIndents: number) => {
|
||||
let expectedIndent = repeatStr(oneIndent, expectedIndents);
|
||||
_assertShiftCommand(tabSize, oneIndent, [lineText + 'aaa'], [createSingleEditOp(expectedIndent, 1, 1, 1, lineText.length + 1)]);
|
||||
};
|
||||
|
||||
var testIndentation = (tabSize: number, lineText: string, expectedOnOutdent: number, expectedOnIndent: number) => {
|
||||
var spaceIndent = '';
|
||||
for (var i = 0; i < tabSize; i++) {
|
||||
let testIndentation = (tabSize: number, lineText: string, expectedOnOutdent: number, expectedOnIndent: number) => {
|
||||
let spaceIndent = '';
|
||||
for (let i = 0; i < tabSize; i++) {
|
||||
spaceIndent += ' ';
|
||||
}
|
||||
|
||||
@@ -970,26 +970,26 @@ suite('Editor Commands - ShiftCommand', () => {
|
||||
|
||||
function _assertUnshiftCommand(tabSize: number, oneIndent: string, text: string[], expected: IIdentifiedSingleEditOperation[]): void {
|
||||
return withEditorModel(text, (model) => {
|
||||
var op = new ShiftCommand(new Selection(1, 1, text.length + 1, 1), {
|
||||
let op = new ShiftCommand(new Selection(1, 1, text.length + 1, 1), {
|
||||
isUnshift: true,
|
||||
tabSize: tabSize,
|
||||
oneIndent: oneIndent,
|
||||
useTabStops: true
|
||||
});
|
||||
var actual = getEditOperation(model, op);
|
||||
let actual = getEditOperation(model, op);
|
||||
assert.deepEqual(actual, expected);
|
||||
});
|
||||
}
|
||||
|
||||
function _assertShiftCommand(tabSize: number, oneIndent: string, text: string[], expected: IIdentifiedSingleEditOperation[]): void {
|
||||
return withEditorModel(text, (model) => {
|
||||
var op = new ShiftCommand(new Selection(1, 1, text.length + 1, 1), {
|
||||
let op = new ShiftCommand(new Selection(1, 1, text.length + 1, 1), {
|
||||
isUnshift: false,
|
||||
tabSize: tabSize,
|
||||
oneIndent: oneIndent,
|
||||
useTabStops: true
|
||||
});
|
||||
var actual = getEditOperation(model, op);
|
||||
let actual = getEditOperation(model, op);
|
||||
assert.deepEqual(actual, expected);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -35,15 +35,15 @@ export function createSingleEditOp(text: string, positionLineNumber: number, pos
|
||||
|
||||
function assertTrimTrailingWhitespaceCommand(text: string[], expected: IIdentifiedSingleEditOperation[]): void {
|
||||
return withEditorModel(text, (model) => {
|
||||
var op = new TrimTrailingWhitespaceCommand(new Selection(1, 1, 1, 1), []);
|
||||
var actual = getEditOperation(model, op);
|
||||
let op = new TrimTrailingWhitespaceCommand(new Selection(1, 1, 1, 1), []);
|
||||
let actual = getEditOperation(model, op);
|
||||
assert.deepEqual(actual, expected);
|
||||
});
|
||||
}
|
||||
|
||||
function assertTrimTrailingWhitespace(text: string[], cursors: Position[], expected: IIdentifiedSingleEditOperation[]): void {
|
||||
return withEditorModel(text, (model) => {
|
||||
var actual = trimTrailingWhitespace(model, cursors);
|
||||
let actual = trimTrailingWhitespace(model, cursors);
|
||||
assert.deepEqual(actual, expected);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1214,13 +1214,32 @@ suite('Editor Controller - Regression tests', () => {
|
||||
model.dispose();
|
||||
});
|
||||
|
||||
test('issue #23539: Setting model EOL isn\'t undoable', () => {
|
||||
usingCursor({
|
||||
text: [
|
||||
'Hello',
|
||||
'world'
|
||||
]
|
||||
}, (model, cursor) => {
|
||||
assertCursor(cursor, new Position(1, 1));
|
||||
model.setEOL(EndOfLineSequence.LF);
|
||||
assert.equal(model.getValue(), 'Hello\nworld');
|
||||
|
||||
model.pushEOL(EndOfLineSequence.CRLF);
|
||||
assert.equal(model.getValue(), 'Hello\r\nworld');
|
||||
|
||||
cursorCommand(cursor, H.Undo);
|
||||
assert.equal(model.getValue(), 'Hello\nworld');
|
||||
});
|
||||
});
|
||||
|
||||
test('issue #47733: Undo mangles unicode characters', () => {
|
||||
const languageId = new LanguageIdentifier('myMode', 3);
|
||||
class MyMode extends MockMode {
|
||||
constructor() {
|
||||
super(languageId);
|
||||
this._register(LanguageConfigurationRegistry.register(this.getLanguageIdentifier(), {
|
||||
surroundingPairs: [{ open: '"', close: '"' }]
|
||||
surroundingPairs: [{ open: '%', close: '%' }]
|
||||
}));
|
||||
}
|
||||
}
|
||||
@@ -1231,8 +1250,8 @@ suite('Editor Controller - Regression tests', () => {
|
||||
withTestCodeEditor(null, { model: model }, (editor, cursor) => {
|
||||
editor.setSelection(new Selection(1, 1, 1, 2));
|
||||
|
||||
cursorCommand(cursor, H.Type, { text: '"' }, 'keyboard');
|
||||
assert.equal(model.getValue(EndOfLinePreference.LF), '"\'"👁\'', 'assert1');
|
||||
cursorCommand(cursor, H.Type, { text: '%' }, 'keyboard');
|
||||
assert.equal(model.getValue(EndOfLinePreference.LF), '%\'%👁\'', 'assert1');
|
||||
|
||||
cursorCommand(cursor, H.Undo, {});
|
||||
assert.equal(model.getValue(EndOfLinePreference.LF), '\'👁\'', 'assert2');
|
||||
@@ -2485,6 +2504,45 @@ suite('Editor Controller - Cursor Configuration', () => {
|
||||
model.dispose();
|
||||
});
|
||||
|
||||
test('issue #15118: remove auto whitespace when pasting entire line', () => {
|
||||
let model = createTextModel(
|
||||
[
|
||||
' function f() {',
|
||||
' // I\'m gonna copy this line',
|
||||
' return 3;',
|
||||
' }',
|
||||
].join('\n')
|
||||
);
|
||||
|
||||
withTestCodeEditor(null, { model: model }, (editor, cursor) => {
|
||||
|
||||
moveTo(cursor, 3, model.getLineMaxColumn(3));
|
||||
cursorCommand(cursor, H.Type, { text: '\n' }, 'keyboard');
|
||||
|
||||
assert.equal(model.getValue(), [
|
||||
' function f() {',
|
||||
' // I\'m gonna copy this line',
|
||||
' return 3;',
|
||||
' ',
|
||||
' }',
|
||||
].join('\n'));
|
||||
assertCursor(cursor, new Position(4, model.getLineMaxColumn(4)));
|
||||
|
||||
cursorCommand(cursor, H.Paste, { text: ' // I\'m gonna copy this line\n', pasteOnNewLine: true });
|
||||
assert.equal(model.getValue(), [
|
||||
' function f() {',
|
||||
' // I\'m gonna copy this line',
|
||||
' return 3;',
|
||||
' // I\'m gonna copy this line',
|
||||
'',
|
||||
' }',
|
||||
].join('\n'));
|
||||
assertCursor(cursor, new Position(5, 1));
|
||||
});
|
||||
|
||||
model.dispose();
|
||||
});
|
||||
|
||||
test('UseTabStops is off', () => {
|
||||
let model = createTextModel(
|
||||
[
|
||||
@@ -4137,6 +4195,86 @@ suite('autoClosingPairs', () => {
|
||||
mode.dispose();
|
||||
});
|
||||
|
||||
test('issue #26820: auto close quotes when not used as accents', () => {
|
||||
let mode = new AutoClosingMode();
|
||||
usingCursor({
|
||||
text: [
|
||||
''
|
||||
],
|
||||
languageIdentifier: mode.getLanguageIdentifier()
|
||||
}, (model, cursor) => {
|
||||
assertCursor(cursor, new Position(1, 1));
|
||||
|
||||
// on the mac US intl kb layout
|
||||
|
||||
// Typing ` + space
|
||||
cursorCommand(cursor, H.CompositionStart, null, 'keyboard');
|
||||
cursorCommand(cursor, H.Type, { text: '\'' }, 'keyboard');
|
||||
cursorCommand(cursor, H.ReplacePreviousChar, { replaceCharCnt: 1, text: '\'' }, 'keyboard');
|
||||
cursorCommand(cursor, H.CompositionEnd, null, 'keyboard');
|
||||
|
||||
assert.equal(model.getValue(), '\'\'');
|
||||
|
||||
// Typing " + space within string
|
||||
cursor.setSelections('test', [new Selection(1, 2, 1, 2)]);
|
||||
cursorCommand(cursor, H.CompositionStart, null, 'keyboard');
|
||||
cursorCommand(cursor, H.Type, { text: '"' }, 'keyboard');
|
||||
cursorCommand(cursor, H.ReplacePreviousChar, { replaceCharCnt: 1, text: '"' }, 'keyboard');
|
||||
cursorCommand(cursor, H.CompositionEnd, null, 'keyboard');
|
||||
|
||||
assert.equal(model.getValue(), '\'""\'');
|
||||
|
||||
// Typing ' + space after '
|
||||
model.setValue('\'');
|
||||
cursor.setSelections('test', [new Selection(1, 2, 1, 2)]);
|
||||
cursorCommand(cursor, H.CompositionStart, null, 'keyboard');
|
||||
cursorCommand(cursor, H.Type, { text: '\'' }, 'keyboard');
|
||||
cursorCommand(cursor, H.ReplacePreviousChar, { replaceCharCnt: 1, text: '\'' }, 'keyboard');
|
||||
cursorCommand(cursor, H.CompositionEnd, null, 'keyboard');
|
||||
|
||||
assert.equal(model.getValue(), '\'\'');
|
||||
|
||||
// Typing ' as a closing tag
|
||||
model.setValue('\'abc');
|
||||
cursor.setSelections('test', [new Selection(1, 5, 1, 5)]);
|
||||
cursorCommand(cursor, H.CompositionStart, null, 'keyboard');
|
||||
cursorCommand(cursor, H.Type, { text: '\'' }, 'keyboard');
|
||||
cursorCommand(cursor, H.ReplacePreviousChar, { replaceCharCnt: 1, text: '\'' }, 'keyboard');
|
||||
cursorCommand(cursor, H.CompositionEnd, null, 'keyboard');
|
||||
|
||||
assert.equal(model.getValue(), '\'abc\'');
|
||||
|
||||
// quotes before the newly added character are all paired.
|
||||
model.setValue('\'abc\'def ');
|
||||
cursor.setSelections('test', [new Selection(1, 10, 1, 10)]);
|
||||
cursorCommand(cursor, H.CompositionStart, null, 'keyboard');
|
||||
cursorCommand(cursor, H.Type, { text: '\'' }, 'keyboard');
|
||||
cursorCommand(cursor, H.ReplacePreviousChar, { replaceCharCnt: 1, text: '\'' }, 'keyboard');
|
||||
cursorCommand(cursor, H.CompositionEnd, null, 'keyboard');
|
||||
|
||||
assert.equal(model.getValue(), '\'abc\'def \'\'');
|
||||
|
||||
// No auto closing if there is non-whitespace character after the cursor
|
||||
model.setValue('abc');
|
||||
cursor.setSelections('test', [new Selection(1, 1, 1, 1)]);
|
||||
cursorCommand(cursor, H.CompositionStart, null, 'keyboard');
|
||||
cursorCommand(cursor, H.Type, { text: '\'' }, 'keyboard');
|
||||
cursorCommand(cursor, H.ReplacePreviousChar, { replaceCharCnt: 1, text: '\'' }, 'keyboard');
|
||||
cursorCommand(cursor, H.CompositionEnd, null, 'keyboard');
|
||||
|
||||
// No auto closing if it's after a word.
|
||||
model.setValue('abc');
|
||||
cursor.setSelections('test', [new Selection(1, 4, 1, 4)]);
|
||||
cursorCommand(cursor, H.CompositionStart, null, 'keyboard');
|
||||
cursorCommand(cursor, H.Type, { text: '\'' }, 'keyboard');
|
||||
cursorCommand(cursor, H.ReplacePreviousChar, { replaceCharCnt: 1, text: '\'' }, 'keyboard');
|
||||
cursorCommand(cursor, H.CompositionEnd, null, 'keyboard');
|
||||
|
||||
assert.equal(model.getValue(), 'abc\'');
|
||||
});
|
||||
mode.dispose();
|
||||
});
|
||||
|
||||
test('issue #20891: All cursors should do the same thing', () => {
|
||||
let mode = new AutoClosingMode();
|
||||
usingCursor({
|
||||
@@ -4159,6 +4297,43 @@ suite('autoClosingPairs', () => {
|
||||
mode.dispose();
|
||||
});
|
||||
|
||||
test('issue #41825: Special handling of quotes in surrounding pairs', () => {
|
||||
const languageId = new LanguageIdentifier('myMode', 3);
|
||||
class MyMode extends MockMode {
|
||||
constructor() {
|
||||
super(languageId);
|
||||
this._register(LanguageConfigurationRegistry.register(this.getLanguageIdentifier(), {
|
||||
surroundingPairs: [
|
||||
{ open: '"', close: '"' },
|
||||
{ open: '\'', close: '\'' },
|
||||
]
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
const mode = new MyMode();
|
||||
const model = createTextModel('var x = \'hi\';', undefined, languageId);
|
||||
|
||||
withTestCodeEditor(null, { model: model }, (editor, cursor) => {
|
||||
editor.setSelections([
|
||||
new Selection(1, 9, 1, 10),
|
||||
new Selection(1, 12, 1, 13)
|
||||
]);
|
||||
cursorCommand(cursor, H.Type, { text: '"' }, 'keyboard');
|
||||
assert.equal(model.getValue(EndOfLinePreference.LF), 'var x = "hi";', 'assert1');
|
||||
|
||||
editor.setSelections([
|
||||
new Selection(1, 9, 1, 10),
|
||||
new Selection(1, 12, 1, 13)
|
||||
]);
|
||||
cursorCommand(cursor, H.Type, { text: '\'' }, 'keyboard');
|
||||
assert.equal(model.getValue(EndOfLinePreference.LF), 'var x = \'hi\';', 'assert2');
|
||||
});
|
||||
|
||||
model.dispose();
|
||||
mode.dispose();
|
||||
});
|
||||
|
||||
test('All cursors should do the same thing when deleting left', () => {
|
||||
let mode = new AutoClosingMode();
|
||||
let model = createTextModel(
|
||||
|
||||
@@ -518,6 +518,20 @@ suite('TextAreaState', () => {
|
||||
);
|
||||
});
|
||||
|
||||
test('issue #49480: Double curly braces inserted', () => {
|
||||
// Characters get doubled
|
||||
testDeduceInput(
|
||||
new TextAreaState(
|
||||
'aa',
|
||||
2, 2,
|
||||
null, null
|
||||
),
|
||||
'aaa',
|
||||
3, 3, true, true,
|
||||
'a', 0
|
||||
);
|
||||
});
|
||||
|
||||
suite('PagedScreenReaderStrategy', () => {
|
||||
|
||||
function testPagedScreenReaderStrategy(lines: string[], selection: Selection, expected: TextAreaState): void {
|
||||
|
||||
55
src/vs/editor/test/browser/editorTestServices.ts
Normal file
55
src/vs/editor/test/browser/editorTestServices.ts
Normal file
@@ -0,0 +1,55 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
'use strict';
|
||||
|
||||
import { IModelDecorationOptions } from 'vs/editor/common/model';
|
||||
import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
|
||||
import { AbstractCodeEditorService } from 'vs/editor/browser/services/abstractCodeEditorService';
|
||||
import { ICommandService, ICommandEvent, CommandsRegistry } from 'vs/platform/commands/common/commands';
|
||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { Emitter, Event } from 'vs/base/common/event';
|
||||
import { TPromise } from 'vs/base/common/winjs.base';
|
||||
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
|
||||
import { IResourceInput } from 'vs/platform/editor/common/editor';
|
||||
|
||||
export class TestCodeEditorService extends AbstractCodeEditorService {
|
||||
public lastInput: IResourceInput;
|
||||
public getActiveCodeEditor(): ICodeEditor { return null; }
|
||||
public openCodeEditor(input: IResourceInput, source: ICodeEditor, sideBySide?: boolean): TPromise<ICodeEditor> {
|
||||
this.lastInput = input;
|
||||
return TPromise.as(null);
|
||||
}
|
||||
public registerDecorationType(key: string, options: IDecorationRenderOptions, parentTypeKey?: string): void { }
|
||||
public removeDecorationType(key: string): void { }
|
||||
public resolveDecorationOptions(decorationTypeKey: string, writable: boolean): IModelDecorationOptions { return null; }
|
||||
}
|
||||
|
||||
export class TestCommandService implements ICommandService {
|
||||
_serviceBrand: any;
|
||||
|
||||
private readonly _instantiationService: IInstantiationService;
|
||||
|
||||
private readonly _onWillExecuteCommand: Emitter<ICommandEvent> = new Emitter<ICommandEvent>();
|
||||
public readonly onWillExecuteCommand: Event<ICommandEvent> = this._onWillExecuteCommand.event;
|
||||
|
||||
constructor(instantiationService: IInstantiationService) {
|
||||
this._instantiationService = instantiationService;
|
||||
}
|
||||
|
||||
public executeCommand<T>(id: string, ...args: any[]): TPromise<T> {
|
||||
const command = CommandsRegistry.getCommand(id);
|
||||
if (!command) {
|
||||
return TPromise.wrapError<T>(new Error(`command '${id}' not found`));
|
||||
}
|
||||
|
||||
try {
|
||||
this._onWillExecuteCommand.fire({ commandId: id });
|
||||
const result = this._instantiationService.invokeFunction.apply(this._instantiationService, [command.handler].concat(args));
|
||||
return TPromise.as(result);
|
||||
} catch (err) {
|
||||
return TPromise.wrapError<T>(err);
|
||||
}
|
||||
}
|
||||
}
|
||||
109
src/vs/editor/test/browser/services/openerService.test.ts
Normal file
109
src/vs/editor/test/browser/services/openerService.test.ts
Normal file
@@ -0,0 +1,109 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
'use strict';
|
||||
|
||||
import URI from 'vs/base/common/uri';
|
||||
import * as assert from 'assert';
|
||||
import { TPromise } from 'vs/base/common/winjs.base';
|
||||
import { TestCodeEditorService } from 'vs/editor/test/browser/editorTestServices';
|
||||
import { ICommandService, NullCommandService, CommandsRegistry } from 'vs/platform/commands/common/commands';
|
||||
import { OpenerService } from 'vs/editor/browser/services/openerService';
|
||||
|
||||
suite('OpenerService', function () {
|
||||
|
||||
const editorService = new TestCodeEditorService();
|
||||
|
||||
let lastCommand: { id: string, args: any[] };
|
||||
|
||||
const commandService = new class implements ICommandService {
|
||||
_serviceBrand: any;
|
||||
onWillExecuteCommand = () => ({ dispose: () => { } });
|
||||
executeCommand(id: string, ...args: any[]): TPromise<any> {
|
||||
lastCommand = { id, args };
|
||||
return TPromise.as(undefined);
|
||||
}
|
||||
};
|
||||
|
||||
setup(function () {
|
||||
lastCommand = undefined;
|
||||
});
|
||||
|
||||
test('delegate to editorService, scheme:///fff', function () {
|
||||
const openerService = new OpenerService(editorService, NullCommandService);
|
||||
openerService.open(URI.parse('another:///somepath'));
|
||||
assert.equal(editorService.lastInput.options.selection, undefined);
|
||||
});
|
||||
|
||||
test('delegate to editorService, scheme:///fff#L123', function () {
|
||||
|
||||
const openerService = new OpenerService(editorService, NullCommandService);
|
||||
|
||||
openerService.open(URI.parse('file:///somepath#L23'));
|
||||
assert.equal(editorService.lastInput.options.selection.startLineNumber, 23);
|
||||
assert.equal(editorService.lastInput.options.selection.startColumn, 1);
|
||||
assert.equal(editorService.lastInput.options.selection.endLineNumber, undefined);
|
||||
assert.equal(editorService.lastInput.options.selection.endColumn, undefined);
|
||||
assert.equal(editorService.lastInput.resource.fragment, '');
|
||||
|
||||
openerService.open(URI.parse('another:///somepath#L23'));
|
||||
assert.equal(editorService.lastInput.options.selection.startLineNumber, 23);
|
||||
assert.equal(editorService.lastInput.options.selection.startColumn, 1);
|
||||
|
||||
openerService.open(URI.parse('another:///somepath#L23,45'));
|
||||
assert.equal(editorService.lastInput.options.selection.startLineNumber, 23);
|
||||
assert.equal(editorService.lastInput.options.selection.startColumn, 45);
|
||||
assert.equal(editorService.lastInput.options.selection.endLineNumber, undefined);
|
||||
assert.equal(editorService.lastInput.options.selection.endColumn, undefined);
|
||||
assert.equal(editorService.lastInput.resource.fragment, '');
|
||||
});
|
||||
|
||||
test('delegate to editorService, scheme:///fff#123,123', function () {
|
||||
|
||||
const openerService = new OpenerService(editorService, NullCommandService);
|
||||
|
||||
openerService.open(URI.parse('file:///somepath#23'));
|
||||
assert.equal(editorService.lastInput.options.selection.startLineNumber, 23);
|
||||
assert.equal(editorService.lastInput.options.selection.startColumn, 1);
|
||||
assert.equal(editorService.lastInput.options.selection.endLineNumber, undefined);
|
||||
assert.equal(editorService.lastInput.options.selection.endColumn, undefined);
|
||||
assert.equal(editorService.lastInput.resource.fragment, '');
|
||||
|
||||
openerService.open(URI.parse('file:///somepath#23,45'));
|
||||
assert.equal(editorService.lastInput.options.selection.startLineNumber, 23);
|
||||
assert.equal(editorService.lastInput.options.selection.startColumn, 45);
|
||||
assert.equal(editorService.lastInput.options.selection.endLineNumber, undefined);
|
||||
assert.equal(editorService.lastInput.options.selection.endColumn, undefined);
|
||||
assert.equal(editorService.lastInput.resource.fragment, '');
|
||||
});
|
||||
|
||||
test('delegate to commandsService, command:someid', function () {
|
||||
|
||||
const openerService = new OpenerService(editorService, commandService);
|
||||
|
||||
// unknown command
|
||||
openerService.open(URI.parse('command:foobar'));
|
||||
assert.equal(lastCommand, undefined);
|
||||
assert.equal(editorService.lastInput.resource.toString(), 'command:foobar');
|
||||
assert.equal(editorService.lastInput.options.selection, undefined);
|
||||
|
||||
const id = `aCommand${Math.random()}`;
|
||||
CommandsRegistry.registerCommand(id, function () { });
|
||||
|
||||
openerService.open(URI.parse('command:' + id));
|
||||
assert.equal(lastCommand.id, id);
|
||||
assert.equal(lastCommand.args.length, 0);
|
||||
|
||||
openerService.open(URI.parse('command:' + id).with({ query: '123' }));
|
||||
assert.equal(lastCommand.id, id);
|
||||
assert.equal(lastCommand.args.length, 1);
|
||||
assert.equal(lastCommand.args[0], '123');
|
||||
|
||||
openerService.open(URI.parse('command:' + id).with({ query: JSON.stringify([12, true]) }));
|
||||
assert.equal(lastCommand.id, id);
|
||||
assert.equal(lastCommand.args.length, 2);
|
||||
assert.equal(lastCommand.args[0], 12);
|
||||
assert.equal(lastCommand.args[1], true);
|
||||
});
|
||||
});
|
||||
@@ -8,134 +8,60 @@ import { ServiceCollection } from 'vs/platform/instantiation/common/serviceColle
|
||||
import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
|
||||
import { IContextKeyService, IContextKeyServiceTarget } from 'vs/platform/contextkey/common/contextkey';
|
||||
import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService';
|
||||
import { CommonCodeEditor } from 'vs/editor/common/commonCodeEditor';
|
||||
import { CommonEditorConfiguration } from 'vs/editor/common/config/commonEditorConfig';
|
||||
import { Cursor } from 'vs/editor/common/controller/cursor';
|
||||
import * as editorCommon from 'vs/editor/common/editorCommon';
|
||||
import * as editorBrowser from 'vs/editor/browser/editorBrowser';
|
||||
import { TextModel } from 'vs/editor/common/model/textModel';
|
||||
import { TestConfiguration } from 'vs/editor/test/common/mocks/testConfiguration';
|
||||
import * as editorOptions from 'vs/editor/common/config/editorOptions';
|
||||
import { IDisposable } from 'vs/base/common/lifecycle';
|
||||
import { Event, Emitter } from 'vs/base/common/event';
|
||||
import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent';
|
||||
import { IPosition } from 'vs/editor/common/core/position';
|
||||
import { EditorExtensionsRegistry } from 'vs/editor/browser/editorExtensions';
|
||||
import { TPromise } from 'vs/base/common/winjs.base';
|
||||
import { onUnexpectedError } from 'vs/base/common/errors';
|
||||
import { IModelDecorationOptions, ITextModel } from 'vs/editor/common/model';
|
||||
import { ITextModel } from 'vs/editor/common/model';
|
||||
import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService';
|
||||
import { INotificationService } from 'vs/platform/notification/common/notification';
|
||||
import { CodeEditorWidget, ICodeEditorWidgetOptions, } from 'vs/editor/browser/widget/codeEditorWidget';
|
||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||
import { TestCodeEditorService, TestCommandService } from 'vs/editor/test/browser/editorTestServices';
|
||||
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
|
||||
import { ICommandService } from 'vs/platform/commands/common/commands';
|
||||
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
|
||||
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||
|
||||
export class TestCodeEditor extends CommonCodeEditor implements editorBrowser.ICodeEditor {
|
||||
export class TestCodeEditor extends CodeEditorWidget implements editorBrowser.ICodeEditor {
|
||||
|
||||
private readonly _onMouseUp: Emitter<editorBrowser.IEditorMouseEvent> = this._register(new Emitter<editorBrowser.IEditorMouseEvent>());
|
||||
public readonly onMouseUp: Event<editorBrowser.IEditorMouseEvent> = this._onMouseUp.event;
|
||||
|
||||
private readonly _onMouseDown: Emitter<editorBrowser.IEditorMouseEvent> = this._register(new Emitter<editorBrowser.IEditorMouseEvent>());
|
||||
public readonly onMouseDown: Event<editorBrowser.IEditorMouseEvent> = this._onMouseDown.event;
|
||||
|
||||
private readonly _onMouseDrag: Emitter<editorBrowser.IEditorMouseEvent> = this._register(new Emitter<editorBrowser.IEditorMouseEvent>());
|
||||
public readonly onMouseDrag: Event<editorBrowser.IEditorMouseEvent> = this._onMouseDrag.event;
|
||||
|
||||
private readonly _onMouseDrop: Emitter<editorBrowser.IEditorMouseEvent> = this._register(new Emitter<editorBrowser.IEditorMouseEvent>());
|
||||
public readonly onMouseDrop: Event<editorBrowser.IEditorMouseEvent> = this._onMouseDrop.event;
|
||||
|
||||
private readonly _onContextMenu: Emitter<editorBrowser.IEditorMouseEvent> = this._register(new Emitter<editorBrowser.IEditorMouseEvent>());
|
||||
public readonly onContextMenu: Event<editorBrowser.IEditorMouseEvent> = this._onContextMenu.event;
|
||||
|
||||
private readonly _onMouseMove: Emitter<editorBrowser.IEditorMouseEvent> = this._register(new Emitter<editorBrowser.IEditorMouseEvent>());
|
||||
public readonly onMouseMove: Event<editorBrowser.IEditorMouseEvent> = this._onMouseMove.event;
|
||||
|
||||
private readonly _onMouseLeave: Emitter<editorBrowser.IEditorMouseEvent> = this._register(new Emitter<editorBrowser.IEditorMouseEvent>());
|
||||
public readonly onMouseLeave: Event<editorBrowser.IEditorMouseEvent> = this._onMouseLeave.event;
|
||||
|
||||
private readonly _onKeyUp: Emitter<IKeyboardEvent> = this._register(new Emitter<IKeyboardEvent>());
|
||||
public readonly onKeyUp: Event<IKeyboardEvent> = this._onKeyUp.event;
|
||||
|
||||
private readonly _onKeyDown: Emitter<IKeyboardEvent> = this._register(new Emitter<IKeyboardEvent>());
|
||||
public readonly onKeyDown: Event<IKeyboardEvent> = this._onKeyDown.event;
|
||||
|
||||
private readonly _onDidScrollChange: Emitter<editorCommon.IScrollEvent> = this._register(new Emitter<editorCommon.IScrollEvent>());
|
||||
public readonly onDidScrollChange: Event<editorCommon.IScrollEvent> = this._onDidScrollChange.event;
|
||||
|
||||
private readonly _onDidChangeViewZones: Emitter<void> = this._register(new Emitter<void>());
|
||||
public readonly onDidChangeViewZones: Event<void> = this._onDidChangeViewZones.event;
|
||||
|
||||
public _isFocused = true;
|
||||
|
||||
protected _createConfiguration(options: editorOptions.IEditorOptions): CommonEditorConfiguration {
|
||||
//#region testing overrides
|
||||
protected _createConfiguration(options: editorOptions.IEditorOptions): editorCommon.IConfiguration {
|
||||
return new TestConfiguration(options);
|
||||
}
|
||||
protected _createView(): void {
|
||||
// Never create a view
|
||||
}
|
||||
//#endregion
|
||||
|
||||
public layout(dimension?: editorCommon.IDimension): void { }
|
||||
|
||||
public focus(): void { }
|
||||
public isFocused(): boolean { return this._isFocused; }
|
||||
public hasWidgetFocus(): boolean { return true; }
|
||||
|
||||
protected _enableEmptySelectionClipboard(): boolean { return false; }
|
||||
protected _scheduleAtNextAnimationFrame(callback: () => void): IDisposable { throw new Error('Notimplemented'); }
|
||||
protected _createView(): void { }
|
||||
|
||||
protected _registerDecorationType(key: string, options: editorCommon.IDecorationRenderOptions, parentTypeKey?: string): void { throw new Error('NotImplemented'); }
|
||||
protected _removeDecorationType(key: string): void { throw new Error('NotImplemented'); }
|
||||
protected _resolveDecorationOptions(typeKey: string, writable: boolean): IModelDecorationOptions { throw new Error('NotImplemented'); }
|
||||
|
||||
// --- test utils
|
||||
getCursor(): Cursor {
|
||||
//#region Testing utils
|
||||
public getCursor(): Cursor {
|
||||
return this.cursor;
|
||||
}
|
||||
|
||||
public registerAndInstantiateContribution<T extends editorCommon.IEditorContribution>(ctor: any): T {
|
||||
let r = <T>this._instantiationService.createInstance(ctor, this);
|
||||
this._contributions[r.getId()] = r;
|
||||
return r;
|
||||
}
|
||||
|
||||
public dispose() {
|
||||
super.dispose();
|
||||
if (this.model) {
|
||||
this.model.dispose();
|
||||
this.model = null;
|
||||
}
|
||||
this._contextKeyService.dispose();
|
||||
}
|
||||
|
||||
protected _triggerEditorCommand(source: string, handlerId: string, payload: any): boolean {
|
||||
const command = EditorExtensionsRegistry.getEditorCommand(handlerId);
|
||||
if (command) {
|
||||
payload = payload || {};
|
||||
payload.source = source;
|
||||
TPromise.as(command.runEditorCommand(null, this, payload)).done(null, onUnexpectedError);
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
//#region ICodeEditor
|
||||
getDomNode(): HTMLElement { throw new Error('Not implemented'); }
|
||||
addContentWidget(widget: editorBrowser.IContentWidget): void { throw new Error('Not implemented'); }
|
||||
layoutContentWidget(widget: editorBrowser.IContentWidget): void { throw new Error('Not implemented'); }
|
||||
removeContentWidget(widget: editorBrowser.IContentWidget): void { throw new Error('Not implemented'); }
|
||||
addOverlayWidget(widget: editorBrowser.IOverlayWidget): void { throw new Error('Not implemented'); }
|
||||
layoutOverlayWidget(widget: editorBrowser.IOverlayWidget): void { throw new Error('Not implemented'); }
|
||||
removeOverlayWidget(widget: editorBrowser.IOverlayWidget): void { throw new Error('Not implemented'); }
|
||||
changeViewZones(callback: (accessor: editorBrowser.IViewZoneChangeAccessor) => void): void { throw new Error('Not implemented'); }
|
||||
getOffsetForColumn(lineNumber: number, column: number): number { throw new Error('Not implemented'); }
|
||||
render(): void { throw new Error('Not implemented'); }
|
||||
getTargetAtClientPoint(clientX: number, clientY: number): editorBrowser.IMouseTarget { throw new Error('Not implemented'); }
|
||||
getScrolledVisiblePosition(position: IPosition): { top: number; left: number; height: number; } { throw new Error('Not implemented'); }
|
||||
applyFontInfo(target: HTMLElement): void { throw new Error('Not implemented'); }
|
||||
//#endregion ICodeEditor
|
||||
}
|
||||
|
||||
export class MockScopeLocation implements IContextKeyServiceTarget {
|
||||
class TestEditorDomElement {
|
||||
parentElement: IContextKeyServiceTarget = null;
|
||||
setAttribute(attr: string, value: string): void { }
|
||||
removeAttribute(attr: string): void { }
|
||||
hasAttribute(attr: string): boolean { return false; }
|
||||
getAttribute(attr: string): string { return undefined; }
|
||||
addEventListener(event: string): void { }
|
||||
removeEventListener(event: string): void { }
|
||||
}
|
||||
|
||||
export interface TestCodeEditorCreationOptions extends editorOptions.IEditorOptions {
|
||||
@@ -148,36 +74,46 @@ export interface TestCodeEditorCreationOptions extends editorOptions.IEditorOpti
|
||||
|
||||
export function withTestCodeEditor(text: string[], options: TestCodeEditorCreationOptions, callback: (editor: TestCodeEditor, cursor: Cursor) => void): void {
|
||||
// create a model if necessary and remember it in order to dispose it.
|
||||
let modelToDispose: TextModel = null;
|
||||
if (!options.model) {
|
||||
modelToDispose = TextModel.createFromString(text.join('\n'));
|
||||
options.model = modelToDispose;
|
||||
options.model = TextModel.createFromString(text.join('\n'));
|
||||
}
|
||||
|
||||
let editor = <TestCodeEditor>_createTestCodeEditor(options);
|
||||
let editor = <TestCodeEditor>createTestCodeEditor(options);
|
||||
callback(editor, editor.getCursor());
|
||||
|
||||
if (modelToDispose) {
|
||||
modelToDispose.dispose();
|
||||
}
|
||||
editor.dispose();
|
||||
}
|
||||
|
||||
export function createTestCodeEditor(model: ITextModel): TestCodeEditor {
|
||||
return _createTestCodeEditor({ model: model });
|
||||
}
|
||||
export function createTestCodeEditor(options: TestCodeEditorCreationOptions): TestCodeEditor {
|
||||
|
||||
function _createTestCodeEditor(options: TestCodeEditorCreationOptions): TestCodeEditor {
|
||||
const services: ServiceCollection = options.serviceCollection || new ServiceCollection();
|
||||
const instantiationService: IInstantiationService = new InstantiationService(services);
|
||||
|
||||
let contextKeyService = new MockContextKeyService();
|
||||
let notificationService = new TestNotificationService();
|
||||
if (!services.has(ICodeEditorService)) {
|
||||
services.set(ICodeEditorService, new TestCodeEditorService());
|
||||
}
|
||||
if (!services.has(IContextKeyService)) {
|
||||
services.set(IContextKeyService, new MockContextKeyService());
|
||||
}
|
||||
if (!services.has(INotificationService)) {
|
||||
services.set(INotificationService, new TestNotificationService());
|
||||
}
|
||||
if (!services.has(ICommandService)) {
|
||||
services.set(ICommandService, new TestCommandService(instantiationService));
|
||||
}
|
||||
if (!services.has(IThemeService)) {
|
||||
services.set(IThemeService, new TestThemeService());
|
||||
}
|
||||
|
||||
let services = options.serviceCollection || new ServiceCollection();
|
||||
services.set(IContextKeyService, contextKeyService);
|
||||
services.set(INotificationService, notificationService);
|
||||
let instantiationService = new InstantiationService(services);
|
||||
|
||||
let editor = new TestCodeEditor(new MockScopeLocation(), options, false, instantiationService, contextKeyService, notificationService);
|
||||
const codeEditorWidgetOptions: ICodeEditorWidgetOptions = {
|
||||
contributions: []
|
||||
};
|
||||
const editor = instantiationService.createInstance(
|
||||
TestCodeEditor,
|
||||
<HTMLElement><any>new TestEditorDomElement(),
|
||||
options,
|
||||
codeEditorWidgetOptions
|
||||
);
|
||||
editor.setModel(options.model);
|
||||
return editor;
|
||||
}
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
'use strict';
|
||||
|
||||
import { IModelDecorationOptions } from 'vs/editor/common/model';
|
||||
import { IDecorationRenderOptions } from 'vs/editor/common/editorCommon';
|
||||
import { AbstractCodeEditorService } from 'vs/editor/browser/services/abstractCodeEditorService';
|
||||
|
||||
export class TestCodeEditorService extends AbstractCodeEditorService {
|
||||
public registerDecorationType(key: string, options: IDecorationRenderOptions, parentTypeKey?: string): void { }
|
||||
public removeDecorationType(key: string): void { }
|
||||
public resolveDecorationOptions(decorationTypeKey: string, writable: boolean): IModelDecorationOptions { return null; }
|
||||
}
|
||||
@@ -41,8 +41,8 @@ export function testCommand(
|
||||
* Extract edit operations if command `command` were to execute on model `model`
|
||||
*/
|
||||
export function getEditOperation(model: ITextModel, command: editorCommon.ICommand): IIdentifiedSingleEditOperation[] {
|
||||
var operations: IIdentifiedSingleEditOperation[] = [];
|
||||
var editOperationBuilder: editorCommon.IEditOperationBuilder = {
|
||||
let operations: IIdentifiedSingleEditOperation[] = [];
|
||||
let editOperationBuilder: editorCommon.IEditOperationBuilder = {
|
||||
addEditOperation: (range: Range, text: string) => {
|
||||
operations.push({
|
||||
range: range,
|
||||
|
||||
@@ -118,21 +118,21 @@ function renderMinimapCharRenderer(minimapCharRenderer: MinimapCharRenderer, y:
|
||||
|
||||
function renderImageData(imageData: ImageData, left: number, top: number): void {
|
||||
let output = '';
|
||||
var offset = 0;
|
||||
var PX_SIZE = 15;
|
||||
for (var i = 0; i < imageData.height; i++) {
|
||||
for (var j = 0; j < imageData.width; j++) {
|
||||
var R = imageData.data[offset];
|
||||
var G = imageData.data[offset + 1];
|
||||
var B = imageData.data[offset + 2];
|
||||
var A = imageData.data[offset + 3];
|
||||
let offset = 0;
|
||||
let PX_SIZE = 15;
|
||||
for (let i = 0; i < imageData.height; i++) {
|
||||
for (let j = 0; j < imageData.width; j++) {
|
||||
let R = imageData.data[offset];
|
||||
let G = imageData.data[offset + 1];
|
||||
let B = imageData.data[offset + 2];
|
||||
let A = imageData.data[offset + 3];
|
||||
offset += 4;
|
||||
|
||||
output += `<div style="position:absolute;top:${PX_SIZE * i}px;left:${PX_SIZE * j}px;width:${PX_SIZE}px;height:${PX_SIZE}px;background:rgba(${R},${G},${B},${A / 256})"></div>`;
|
||||
}
|
||||
}
|
||||
|
||||
var domNode = document.createElement('div');
|
||||
let domNode = document.createElement('div');
|
||||
domNode.style.position = 'absolute';
|
||||
domNode.style.top = top + 'px';
|
||||
domNode.style.left = left + 'px';
|
||||
|
||||
Reference in New Issue
Block a user