Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 36 additions & 28 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ace-linters-root",
"version": "2.3.0",
"version": "2.3.1",
"scripts": {
"build:parts": "npm run build -ws",
"build": "npm run build:parts && vite build",
Expand Down
5 changes: 3 additions & 2 deletions packages/ace-linters/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ace-linters",
"author": "Azat Alimov <mkslanc@gmail.com>",
"version": "2.1.2",
"version": "2.1.3",
"scripts": {
"clean": "rimraf build",
"postbuild": "node postbuild.js",
Expand Down Expand Up @@ -29,7 +29,8 @@
"vscode-css-languageservice": "^6.3.10",
"vscode-json-languageservice": "^5.7.2",
"luaparse": "^0.3.1",
"showdown": "^2.1.0",
"marked": "^18.0.0",
"dompurify": "^3.3.3",
"vscode-ws-jsonrpc": "^3.4.0",
"htmlhint": "^1.9.2",
"@xml-tools/constraints": "^1.1.1",
Expand Down
5 changes: 3 additions & 2 deletions packages/ace-linters/src/ace/hover-tooltip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,9 @@ export class HoverTooltip extends Tooltip {
element.style.display = "block";

this.$setPosition(editor, position, true, range);

editor.renderer["$textLayer"].dom.$fixPositionBug(element);
if (editor.renderer["$textLayer"].dom.$fixPositionBug) {
editor.renderer["$textLayer"].dom.$fixPositionBug(element);
}
popupManager.addPopup(this);
}

Expand Down
9 changes: 9 additions & 0 deletions packages/ace-linters/src/components/markdownConverter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import {MarkDownConverter} from "../types/converters";
import {marked} from "marked";
import DOMPurify from 'dompurify';

export const defaultMarkdownConverter: MarkDownConverter = {
makeHtml(markdownText: string) {
return DOMPurify.sanitize(marked.parse(markdownText, {async: false}));
}
}
4 changes: 2 additions & 2 deletions packages/ace-linters/src/language-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {
} from "./type-converters/lsp/lsp-converters";
import * as lsp from "vscode-languageserver-protocol";

import showdown from "showdown";
import {createWorker} from "./cdn-worker";
import {SignatureTooltip} from "./components/signature-tooltip";
import {
Expand All @@ -40,6 +39,7 @@ import {popupManager} from "./ace/popupManager";
import {extractDiagnosticQuickFixesAtPosition} from "./components/hover/hover-quick-fixes";
import {resolveHoverModel} from "./components/hover/hover-data-resolver";
import {createHoverViewNode} from "./components/hover/hover-view";
import {defaultMarkdownConverter} from "./components/markdownConverter";

export class LanguageProvider {
activeEditor: Ace.Editor | null;
Expand Down Expand Up @@ -152,7 +152,7 @@ export class LanguageProvider {
}
});

this.options.markdownConverter ||= new showdown.Converter();
this.options.markdownConverter ||= defaultMarkdownConverter;
if (options?.workspacePath) {
this.workspaceUri = convertToUri(options.workspacePath);
}
Expand Down
12 changes: 12 additions & 0 deletions tests/ui-smoke/ace-linters.contract.tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,18 @@ describe("ace-linters UI contract tests", function () {
}
});

it("loads the UMD bundle in an AMD environment without runtime errors", async function () {
await harness.openScenario("ace-linters-amd");
await harness.sleep(1500);
const page = harness.getPage();

const ready = await page.evaluate(() => window.testFlags.ready === true);
const errors = harness.getConsoleErrors();

expect(ready, "AMD scenario should finish booting").to.equal(true);
expect(errors, `Console errors: ${errors.join("\n")}`).to.be.empty;
});

it("handles YAML schema options without critical runtime errors", async function () {
await harness.openScenario("ace-linters");
await harness.initAceLinterFlags();
Expand Down
43 changes: 43 additions & 0 deletions tests/ui-smoke/scenarios/ace-linters-amd.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8"/>
<title>ace-linters AMD smoke</title>
<link rel="icon" href="data:,"/>
</head>
<body>
<div id="editor" style="height: 300px;"></div>
<script src="http://127.0.0.1:8080/vendor/ace/ace.js"></script>
<script src="http://127.0.0.1:8080/vendor/ace/ext-language_tools.js"></script>
<script>
window.testFlags = {ready: false};
window.__amdModules = {};
window.define = function (deps, factory) {
const exports = {};
factory(exports);
Object.assign(window.__amdModules, exports);
Object.assign(window, exports);
};
window.define.amd = {};
</script>
<script src="http://127.0.0.1:8080/build/ace-linters/ace-linters.js"></script>
<script>
window.editor = ace.edit("editor", {
theme: "ace/theme/textmate",
mode: "ace/mode/text",
value: "console.log('Hello world' ;"
});
window.editor.setOptions({
enableBasicAutocompletion: true,
enableSnippets: true,
enableLiveAutocompletion: true
});

window.languageProvider = LanguageProvider.fromCdn("http://127.0.0.1:8080/build/ace-linters");
window.languageProvider.registerEditor(window.editor);
setTimeout(() => {
window.testFlags.ready = true;
}, 1000);
</script>
</body>
</html>
Loading