Skip to content

Commit 93043a7

Browse files
authored
Merge pull request #1 from JasperDeSutter/browser-support
Browser support
2 parents ec6712f + 5d41c0f commit 93043a7

File tree

3 files changed

+51
-17
lines changed

3 files changed

+51
-17
lines changed

wasm-demo/www/index.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@ import 'monaco-editor/esm/vs/editor/standalone/browser/toggleHighContrast/toggle
4949
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
5050
import * as rustConf from 'monaco-editor/esm/vs/basic-languages/rust/rust';
5151
import exampleCode from './example-code';
52+
import encoding from 'text-encoding';
53+
54+
if (typeof TextEncoder === "undefined") {
55+
// Edge polyfill, https://rustwasm.github.io/docs/wasm-bindgen/reference/browser-support.html
56+
self.TextEncoder = encoding.TextEncoder
57+
self.TextDecoder = encoding.TextDecoder
58+
}
5259

5360
import './index.css';
5461

@@ -93,8 +100,8 @@ monaco.languages.onLanguage(modeId, async () => {
93100
});
94101
monaco.languages.registerCodeLensProvider(modeId, {
95102
provideCodeLenses(m) {
96-
const lenses = state.code_lenses();
97-
return lenses.map(({ range, command }) => {
103+
const code_lenses = state.code_lenses();
104+
const lenses = code_lenses.map(({ range, command }) => {
98105
const position = {
99106
column: range.startColumn,
100107
lineNumber: range.startLineNumber,
@@ -114,6 +121,8 @@ monaco.languages.onLanguage(modeId, async () => {
114121
}
115122
};
116123
});
124+
125+
return { lenses, dispose() { } };
117126
},
118127
});
119128
monaco.languages.registerReferenceProvider(modeId, {

wasm-demo/www/package-lock.json

Lines changed: 38 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wasm-demo/www/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"author": "rust-analyzer developers",
1010
"license": "(MIT OR Apache-2.0)",
1111
"dependencies": {
12-
"monaco-editor": "^0.16.2",
12+
"monaco-editor": "^0.18.1",
13+
"text-encoding": "^0.7.0",
1314
"wasm_demo": "file:../pkg"
1415
},
1516
"devDependencies": {

0 commit comments

Comments
 (0)