Skip to content

Commit

Permalink
Merge branch 'eclipse-theia:master' into polymtl/tests-api-implementa…
Browse files Browse the repository at this point in the history
…tion
  • Loading branch information
mathblin authored Mar 14, 2023
2 parents 0b5a971 + c7ca0d5 commit 7cf4930
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
run: |
yarn docs
env:
NODE_OPTIONS: --max_old_space_size=8196
NODE_OPTIONS: --max_old_space_size=9216

- name: Publish GH Pages
uses: peaceiris/actions-gh-pages@v3
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
with:
python-version: "3.x"

- name: Build
- name: Build Browser
shell: bash
run: |
yarn --skip-integrity-check --network-timeout 100000
Expand All @@ -42,6 +42,11 @@ jobs:
NODE_OPTIONS: --max_old_space_size=4096
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # https://github.com/microsoft/vscode-ripgrep/issues/9

- name: Build Playwright
shell: bash
run: |
yarn --cwd examples/playwright build
- name: Test (playwright)
uses: GabrielBB/xvfb-action@v1
with:
Expand Down
3 changes: 2 additions & 1 deletion configs/typedoc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"../+(dev-packages|examples|typings|scripts)/**",
"../packages/*/lib/**",
"**/node_modules/**",
"**/*spec.ts"
"**/*spec.ts",
"../plugins/*"
],
"excludeExternals": true,
"external-modulemap": ".*\/packages\/([\\w\\-_]+)\/",
Expand Down
13 changes: 11 additions & 2 deletions examples/api-tests/src/typescript.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ describe('TypeScript', function () {
const pluginViewRegistry = container.get(PluginViewRegistry);

const typescriptPluginId = 'vscode.typescript-language-features';
const referencesPluginId = 'ms-vscode.references-view';
const referencesPluginId = 'vscode.references-view';
const eslintPluginId = 'dbaeumer.vscode-eslint';
/** @type Uri.URI */
const rootUri = workspaceService.tryGetRoots()[0].resource;
Expand Down Expand Up @@ -199,8 +199,17 @@ describe('TypeScript', function () {
async function closePeek(editor) {
await assertPeekOpened(editor);

console.log('closePeek() - Attempt to close by sending "Escape"');
keybindings.dispatchKeyDown('Escape');
await waitForAnimation(() => !contextKeyService.match('listFocus'));
await waitForAnimation(() => {
const isClosed = !contextKeyService.match('listFocus');
if (!isClosed) {
console.log('...');
keybindings.dispatchKeyDown('Escape');
return false;
}
return true;
});
assert.isTrue(contextKeyService.match('editorTextFocus'));
assert.isFalse(contextKeyService.match('referenceSearchVisible'));
assert.isFalse(contextKeyService.match('listFocus'));
Expand Down
1 change: 1 addition & 0 deletions examples/playwright/docs/DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Building

Run `yarn` in the root directory of the repository.
In order to build Playwright and install dependencies (ex: chromium) run `yarn --cwd examples/playwright` at the root of the repository.

## Executing the tests

Expand Down
1 change: 0 additions & 1 deletion examples/playwright/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
},
"homepage": "https://github.com/eclipse-theia/theia",
"scripts": {
"prepare": "yarn clean && yarn build",
"clean": "rimraf lib *.tsbuildinfo",
"build": "tsc --incremental && npx playwright install chromium",
"theia:start": "rimraf .tmp.cfg && THEIA_CONFIG_DIR=$PWD/.tmp.cfg yarn --cwd ../browser start",
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,9 @@
"theiaPluginsDir": "plugins",
"theiaPlugins": {
"vscode.markdown-language-features": "https://open-vsx.org/api/vscode/markdown-language-features/1.64.2/file/vscode.markdown-language-features-1.64.2.vsix",
"eclipse-theia.builtin-extension-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.66.2/file/eclipse-theia.builtin-extension-pack-1.66.2.vsix",
"eclipse-theia.builtin-extension-pack": "https://open-vsx.org/api/eclipse-theia/builtin-extension-pack/1.70.2/file/eclipse-theia.builtin-extension-pack-1.70.2.vsix",
"EditorConfig.EditorConfig": "https://open-vsx.org/api/EditorConfig/EditorConfig/0.14.4/file/EditorConfig.EditorConfig-0.14.4.vsix",
"dbaeumer.vscode-eslint": "https://open-vsx.org/api/dbaeumer/vscode-eslint/2.1.20/file/dbaeumer.vscode-eslint-2.1.20.vsix",
"ms-vscode.references-view": "https://open-vsx.org/api/ms-vscode/references-view/0.0.89/file/ms-vscode.references-view-0.0.89.vsix"
"dbaeumer.vscode-eslint": "https://open-vsx.org/api/dbaeumer/vscode-eslint/2.1.20/file/dbaeumer.vscode-eslint-2.1.20.vsix"
},
"theiaPluginsExcludeIds": [
"ms-vscode.js-debug-companion",
Expand All @@ -113,6 +112,7 @@
"vscode.github",
"vscode.github-authentication",
"vscode.ipynb",
"vscode.microsoft-authentication"
"vscode.microsoft-authentication",
"ms-vscode.references-view"
]
}

0 comments on commit 7cf4930

Please sign in to comment.