From 5bd30b20db958a5855a6064a4448ecadd7e90a68 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 4 Jun 2018 19:44:46 +0200 Subject: [PATCH] bring titlebarplus up to date MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Merge NPM Scripts: Added configuration option to change default click action #49282 * fix #50560 * Fix getmac test (#48804) * Cleaning up some typos in vscode.d.ts and vscode.proposed.d.ts (#50533) * yarn.lock changes * grid - log serialized state if restoring failed * Fixes #50382: Align .mtku with .detected-link * debug issues back to isidorn * Hide interactive playground commands from command palette (fixes #49706) * grid - drop outline as focus indication and rely on dimmed state * grid - allow to close empty group when closing all editors of a group * grid - get preferredSize from grid * Fixes #43003: Cannot specify a global problemMatcher in tasks.json * cleanup integrated terminal support for debugging * grid - action wording tweaks * #45663 Use core translations asset * grid - allow to close dirty diff editor if master is still opened in same group * Support to run npm install from a package node * grid - log previous UI state upon error * grid - stronger border top color otherwise when a tab is showing in a vertical split, the border collides with the sash border * remove todo * do not append logLevel #47774 * Implement Go To Next/Previous Breakpoint editor actions * Include enabledOnly in debug model interface * remove from schema #47774 * #45663 fix compilations * change openBreakpointSource to use IBreakpoint * return passed context if resourceOrContext is not useful * fix off by one issue * Simplify implementation * return context if it has a groupId * polish * Fixes Microsoft/monaco-editor#891: Focus editor when returning from context menu * go to next / previosu breakpoint minor polish * Add Endgame for 1.24 * fix index computing for editor close case * Fix #49145 - Enable/Disable viewlets by views when context - Move viewlet enablement/disablement to views service - Fix - adopt if a viewlet extension is disabled/removed * Avoid command palette entry (#49340) * [handlebars] code-folding algorithm is less useful than Indentation-based one. Fixes #48457 * use upper lang id * Fixes #49378 * #49145 Store placeholder states for all viewlets * Add `logicalLine` argument to `mutlicursor.insertBelow` and `mutlicursor.insertAbove` * Removed duplicate loop * eliminate code duplication; use resolveWorkspaceFolder() * #45663 Get all asset types * [css] update service * [html] update services * grid - fix compile * add User-Id to marketplace build requests * Improve rendererType description Fixes #50617 * fix #50672 * Fixes #49173 * fix #50321 * fix #50670 * Install option not needed when we have Install and Restart Fixes #50669 * Fixes #50616, Showing/hiding details in Issue Reporter resets scroll position * Fix #50642, fix #50673 * Issue reporter and process explorer windows should close when the parent window closes, fixes #50716 * Issue Reporter should clear the error state when selecting an extension, fixes #50702 * Extracting methods * Make sure we update the webview's state on setState * Avoid prompting for same file type in the same session #50537 * Use language name instead of locale in the prompt #50738 * Use correct failed error code for webview resource load error * Mark unused parameter * Restore restart * Try serializing webviews even if they have not called setState Fixes #50752 * Change parameter name to match interface name Fixes #50745 * Fix non-serializable webviews being revived if they called setState * Include recommended extensions in telemetry events to determine success * Fix #49777 - Emmet balance In after balance out should go back to initial selection and not first child (#49996) * Update Emmet - balance.ts * Cover all cases * Update prompt msg Fixes #50738 * Fix #50632 * search-rg has no icon * EH search - replace search.enableSearchProviders with a search-rg specific setting * fix #50742 * fix #50691 * part of #50760 * smoke: uncomment debug suite * smoketest: use yarn * grid - allow to close empty groups via middle click (#50733) * careful with path comparisons on windows related to #50760 * smoke: run yarn verbose * fix #50710 * Improve description (#43208) * fix #50722 * Fix #50663 * Fix #47586 * fixes #50609 * fixes #50026 * :lipstick: * fix #50773 * improve perf of findId and getElementById, #50575 * don't show outline when there are more then 7500 symbols, #50575 * fix typos * polish for #50667 * fix #50700 * grid keep sizing after branch node demotion fixes #50564 * grid - for now remove editorGroup.activeEmptyBackground * fix #50726 * grid: resize views when branch is demoted fixes #50675 * fix #50727 * fix #50734 * remove preview rant from search.location * splitview: dont propagate white-sapce property fixes #50720 * fix #50774 * Fixes #50296 * fix #50207 * Fixes #24670: Add API to determine if the task service supports parallel task execution. * fix #50741 * Fixes #49400: Cannot read property 'then' of undefined * Fix #50717 * Fix #48901 * polish debug.toolBarLocation fixes #50786 * Fix #50717 * missing compilation * Fix #48225 * fix #50711 * Fix errors installing extension from Welcome page (fixes #50753) * fixes #50794 * fixes #50787 * continuous build: use vsts npm feed * Fix for #50792: empty pre post scripts not rendered properly * Fix #50728 * continuous build: use vsts feed * Fix for #50792 npm exclude doesn´t work for folder names * Move previewOptions, #50788 * build: remove npm auth * better fix for #50710 * Revert "Merge pull request #49790 from usernamehw/raw_settings" This reverts commit f92a162b418b2f78f8052e79b1e7368c4b831e40, reversing changes made to fc710af79278de566e2e168d55e5bb5b83134b98. * Remove unused variable * Fix regression in C# TextMate grammar related to lambda parameters This tweak fixes a regression recently introduced in the C# TextMate grammar around implicitly-typed lambda parameters. * https://github.com/dotnet/csharp-tmLanguage/issues/119 * https://github.com/dotnet/csharp-tmLanguage/issues/120 * Fix parameter not being escaped Fixes #49057 * wip: grid.getNeighborViews * Make sure we use normalized path for compare Fixes #50760 (the path should already have been normalized at this point so I don't think there is any user impact) * Clean up importModuleSpecifier wording Fixes #50817 * Remove duplicate strings and small cleanup * Spelling fix Ouoting -> Quoting * Restore default settings editor keybinding * Dont trigger emmet for # in selectors Fixes #49269 * Hide settings editor feedback button in stable * Use better colors for markdown code blocks * Moving webview api back to proposed for more polishing #49022 * Shorten showUnused setting name Fixes #50648 * fix #50678 * Don't include imports in js/ts document symbol results Fixes #50829 * smoketest: remove verbose from yarn * smoketest: clear state from failing search tests * minor rename * Fix markdown preview not setting context properly on first creation Fixes #50558 * smoketest: update to package-lock.json fixes #50857 * smoketest: bring back search tests * #48901 Expand by default only in custom viewlets * fixes #50812 * open editors: clear focus when group without editors is active fixes #50563 * Fix MaxNumber incrementFileName bug * Fixes #48758: Do not import standalone editor modules * fixes #50864 * Use `MAX_SAFE_SMALL_INTEGER` * Fixes #50858: Task api is still marked as proposed * fixes #50737 * fix #50867 * Fix: showQuickPick keeps showing infinite progress (fixes #50863) * Clarify for translation (fixes #50634) * fixes #50870 * fix #50479 * grid - todo@grid => todo@ben * grid - adopt new getNeighborViews() method * grid - add workbench.action.closeEditorsAndGroup * open editors: close group action fixes #50625 * open editors: use actionRunner for contexts fixes #50621 * [css][html] update service * grid: getNeighborViews * grid - adopt wrapping * Some menu action clients (ActionBar) handle alternative actions on their own so the alternative actions should be ignored fixes #50581 * fillInActionBarActions and fillInContextMenuActions for clarity * Remove inconsistent use of active in terminal API Related #48434 * Try using fixAllDescription for js/ts quick fixes Fixes #42549 * Fixes #50828, code-insiders --status triggered exception in main process * Pick up ts 2.9.1 final * Fix for #50868 and #50884 * Still gray out vars even if user has disabled suggestions Fixes #50890 * grid: fix neighbor npe issue * grid: more getNeighborViews tests * grid: use boundaries for neighbor finding * grid: getNeighborViews perf * grid: add todo * 2018-05-31. Merged in translations from Transifex. * Update GDPR annotation * update message * Add specific `refactor.move` scope for js/ts move to new file action * Use localized language name when available * Add proper contribution schema for ts server pluguins #50682 * Fix extra word * Fix #50909 - add link to new settings editor from old one * Left-align settings editor preview prompt * grid - fix issues with touchbar updating * grid - use viewColumnToEditorGroup in more places * grid - close all groups should preserve first group * Reapply fix for #50790 * grid - assign some default keybindings for focus group * Fixes #50763: All running Visual Studio code instances shutdown all at once * grid - :lipstick: * fixes #50926 * show alternative actions when alt is pressed, not only on mouse over * open editors: click on groups should activate them * update description (for #50677) * Fix #50835 * grid - tweak some groups access order * one more time, fix #50321 * beware of keybinding command null arguments fixes #50821 * grid - prevent multiple confirmation dialogs for the same editor to show up (for #50539) * smoketest: go-to-definition is flaky fixes #50944 fixes #49107 * Fixes #50943: TSC version 2.9.x in watch mode prints different end compile message * grid - fix bad === for editors * :lipstick: grid, cleanup getViews() * Update distro commit and third party notices * Use localizedLanguageName instead of languageNameLocalized which doesnt exist * Remove now unneeded any * Make sure unused diags are still updated when suggestions are disabled Fixes #50890 * Fix unused var * Update version * Update issue templates, #49380 * Fix #50893 - escape regex chars when copy search string from editor * Fix #50985 - don't take editor text when toggling search details --- grid.html | 202 ++++++++++++++++++++++++ index.html | 2 - smoke/src/application.ts | 2 +- smoke/src/areas/editor/editor.test.ts | 8 +- smoke/src/areas/editor/editors.ts | 2 +- smoke/src/areas/preferences/settings.ts | 9 +- smoke/src/areas/search/search.test.ts | 13 +- smoke/src/areas/search/search.ts | 4 + smoke/src/areas/workbench/workbench.ts | 2 +- smoke/src/main.ts | 4 +- smoke/src/utils.ts | 18 +++ 11 files changed, 246 insertions(+), 20 deletions(-) create mode 100644 grid.html create mode 100644 smoke/src/utils.ts diff --git a/grid.html b/grid.html new file mode 100644 index 0000000000000..3930d978bd77e --- /dev/null +++ b/grid.html @@ -0,0 +1,202 @@ + + + + + + + Grid Example + + + + + + + + + + + \ No newline at end of file diff --git a/index.html b/index.html index 785f4e3abc0cc..384c987fed1cf 100644 --- a/index.html +++ b/index.html @@ -7,8 +7,6 @@
- diff --git a/smoke/src/application.ts b/smoke/src/application.ts index 59f2e6a13c0e2..4894252466c45 100644 --- a/smoke/src/application.ts +++ b/smoke/src/application.ts @@ -63,7 +63,7 @@ export class Application { async start(): Promise { await this._start(); await this.code.waitForElement('.explorer-folders-view'); - await this.code.waitForActiveElement(`.editor-container[id="workbench.editor.walkThroughPart"] > div > div[tabIndex="0"]`); + await this.code.waitForActiveElement(`.editor-instance[id="workbench.editor.walkThroughPart"] > div > div[tabIndex="0"]`); } async restart(options: { workspaceOrFolder?: string, extraArgs?: string[] }): Promise { diff --git a/smoke/src/areas/editor/editor.test.ts b/smoke/src/areas/editor/editor.test.ts index af9f49cf4c696..bc851c5b0d28d 100644 --- a/smoke/src/areas/editor/editor.test.ts +++ b/smoke/src/areas/editor/editor.test.ts @@ -53,18 +53,18 @@ export function setup() { const app = this.app as Application; await app.workbench.quickopen.openFile('app.js'); - await app.workbench.editor.gotoDefinition('app.js', 'express', 11); + await app.workbench.editor.gotoDefinition('app.js', 'app', 14); - await app.workbench.editors.waitForActiveTab('index.d.ts'); + await app.workbench.editor.waitForHighlightingLine('app.js', 11); }); it(`verifies that 'Peek Definition' works`, async function () { const app = this.app as Application; await app.workbench.quickopen.openFile('app.js'); - const peek = await app.workbench.editor.peekDefinition('app.js', 'express', 11); + const peek = await app.workbench.editor.peekDefinition('app.js', 'app', 14); - await peek.waitForFile('index.d.ts'); + await peek.waitForFile('app.js'); }); }); } \ No newline at end of file diff --git a/smoke/src/areas/editor/editors.ts b/smoke/src/areas/editor/editors.ts index 5ac99c68e8cda..50f244e8ed845 100644 --- a/smoke/src/areas/editor/editors.ts +++ b/smoke/src/areas/editor/editors.ts @@ -23,7 +23,7 @@ export class Editors { } async waitForActiveEditor(filename: string): Promise { - const selector = `.editor-container .monaco-editor[data-uri$="${filename}"] textarea`; + const selector = `.editor-instance .monaco-editor[data-uri$="${filename}"] textarea`; return this.code.waitForActiveElement(selector); } diff --git a/smoke/src/areas/preferences/settings.ts b/smoke/src/areas/preferences/settings.ts index 6ac7bffece992..ecdef71c03360 100644 --- a/smoke/src/areas/preferences/settings.ts +++ b/smoke/src/areas/preferences/settings.ts @@ -8,6 +8,7 @@ import * as path from 'path'; import { Editor } from '../editor/editor'; import { Editors } from '../editor/editors'; import { Code } from '../../vscode/code'; +import { QuickOpen } from '../quickopen/quickopen'; export enum ActivityBarPosition { LEFT = 0, @@ -18,7 +19,7 @@ const SEARCH_INPUT = '.settings-search-input input'; export class SettingsEditor { - constructor(private code: Code, private userDataPath: string, private editors: Editors, private editor: Editor) { } + constructor(private code: Code, private userDataPath: string, private editors: Editors, private editor: Editor, private quickopen: QuickOpen) { } async addUserSetting(setting: string, value: string): Promise { await this.openSettings(); @@ -41,10 +42,6 @@ export class SettingsEditor { } private async openSettings(): Promise { - if (process.platform === 'darwin') { - await this.code.dispatchKeybinding('cmd+,'); - } else { - await this.code.dispatchKeybinding('ctrl+,'); - } + await this.quickopen.runCommand('Preferences: Open User Settings'); } } \ No newline at end of file diff --git a/smoke/src/areas/search/search.test.ts b/smoke/src/areas/search/search.test.ts index 484e428e7b1f3..3f6b713daf33f 100644 --- a/smoke/src/areas/search/search.test.ts +++ b/smoke/src/areas/search/search.test.ts @@ -3,16 +3,23 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import * as cp from 'child_process'; import { Application } from '../../application'; export function setup() { describe('Search', () => { + after(function () { + const app = this.app as Application; + cp.execSync('git checkout .', { cwd: app.workspacePath }); + cp.execSync('git reset --hard origin/master', { cwd: app.workspacePath }); + }); + it('searches for body & checks for correct result number', async function () { const app = this.app as Application; await app.workbench.search.openSearchViewlet(); await app.workbench.search.searchFor('body'); - await app.workbench.search.waitForResultText('14 results in 5 files'); + await app.workbench.search.waitForResultText('21 results in 6 files'); }); it('searches only for *.js files & checks for correct result number', async function () { @@ -31,7 +38,7 @@ export function setup() { const app = this.app as Application; await app.workbench.search.searchFor('body'); await app.workbench.search.removeFileMatch(1); - await app.workbench.search.waitForResultText('10 results in 4 files'); + await app.workbench.search.waitForResultText('17 results in 5 files'); }); it('replaces first search result with a replace term', async function () { @@ -42,7 +49,7 @@ export function setup() { await app.workbench.search.setReplaceText('ydob'); await app.workbench.search.replaceFileMatch(1); - await app.workbench.search.waitForResultText('10 results in 4 files'); + await app.workbench.search.waitForResultText('17 results in 5 files'); await app.workbench.search.searchFor('ydob'); await app.workbench.search.setReplaceText('body'); diff --git a/smoke/src/areas/search/search.ts b/smoke/src/areas/search/search.ts index b1ce30d30b499..f5cda6b2af1cf 100644 --- a/smoke/src/areas/search/search.ts +++ b/smoke/src/areas/search/search.ts @@ -63,6 +63,10 @@ export class Search extends Viewlet { await this.code.waitAndClick(`${VIEWLET} .search-widget .monaco-button.toggle-replace-button.collapse`); } + async collapseReplace(): Promise { + await this.code.waitAndClick(`${VIEWLET} .search-widget .monaco-button.toggle-replace-button.expand`); + } + async setReplaceText(text: string): Promise { await this.code.waitAndClick(`${VIEWLET} .search-widget .replace-container .monaco-inputbox input[title="Replace"]`); await this.code.waitForElement(`${VIEWLET} .search-widget .replace-container .monaco-inputbox.synthetic-focus input[title="Replace"]`); diff --git a/smoke/src/areas/workbench/workbench.ts b/smoke/src/areas/workbench/workbench.ts index 661e0699a4da9..005265f912cec 100644 --- a/smoke/src/areas/workbench/workbench.ts +++ b/smoke/src/areas/workbench/workbench.ts @@ -55,7 +55,7 @@ export class Workbench { this.debug = new Debug(code, this.quickopen, this.editors, this.editor); this.statusbar = new StatusBar(code); this.problems = new Problems(code); - this.settingsEditor = new SettingsEditor(code, userDataPath, this.editors, this.editor); + this.settingsEditor = new SettingsEditor(code, userDataPath, this.editors, this.editor, this.quickopen); this.keybindingsEditor = new KeybindingsEditor(code); this.terminal = new Terminal(code); } diff --git a/smoke/src/main.ts b/smoke/src/main.ts index 9d2262a1dc785..69caa041d4138 100644 --- a/smoke/src/main.ts +++ b/smoke/src/main.ts @@ -188,8 +188,8 @@ async function setupRepository(): Promise { cp.spawnSync('git', ['clean', '-xdf'], { cwd: workspacePath }); } - console.log('*** Running npm install...'); - cp.execSync('npm install', { cwd: workspacePath, stdio: 'inherit' }); + console.log('*** Running yarn...'); + cp.execSync('yarn', { cwd: workspacePath, stdio: 'inherit' }); } } diff --git a/smoke/src/utils.ts b/smoke/src/utils.ts new file mode 100644 index 0000000000000..35d9ef41ad905 --- /dev/null +++ b/smoke/src/utils.ts @@ -0,0 +1,18 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { ISuiteCallbackContext, ITestCallbackContext } from 'mocha'; + +export function describeRepeat(n: number, description: string, callback: (this: ISuiteCallbackContext) => void): void { + for (let i = 0; i < n; i++) { + describe(`${description} (iteration ${i})`, callback); + } +} + +export function itRepeat(n: number, description: string, callback: (this: ITestCallbackContext, done: MochaDone) => any): void { + for (let i = 0; i < n; i++) { + it(`${description} (iteration ${i})`, callback); + } +}