Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 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
2 changes: 1 addition & 1 deletion docs/diagrams/mlc-details.drawio
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<mxCell id="k4CSAVVTnt-oedxpcEqQ-55" value="&lt;b&gt;&lt;font style=&quot;font-size: 34px;&quot;&gt;monaco-language&lt;span style=&quot;background-color: initial;&quot;&gt;client&lt;/span&gt;&lt;/font&gt;&lt;/b&gt;" style="rounded=1;whiteSpace=wrap;html=1;verticalAlign=top;fontSize=24;fillColor=#dae8fc;strokeColor=#6c8ebf;strokeWidth=3;arcSize=6;align=left;spacingLeft=16;" parent="1" vertex="1">
<mxGeometry x="-1640" y="-880" width="1480" height="840" as="geometry" />
</mxCell>
<mxCell id="_uGb1KgNCc7sdFown7Vx-17" value="&lt;font style=&quot;font-size: 24px;&quot;&gt;LanguageClientsManager (optional)&lt;/font&gt;" style="rounded=1;html=1;fillColor=light-dark(#97D077,#80CC80);strokeColor=#005700;fontColor=#090909;verticalAlign=top;arcSize=10;whiteSpace=wrap;align=left;spacingLeft=10;opacity=30;" parent="1" vertex="1">
<mxCell id="_uGb1KgNCc7sdFown7Vx-17" value="&lt;font style=&quot;font-size: 24px;&quot;&gt;LanguageClientManager (optional)&lt;/font&gt;" style="rounded=1;html=1;fillColor=light-dark(#97D077,#80CC80);strokeColor=#005700;fontColor=#090909;verticalAlign=top;arcSize=10;whiteSpace=wrap;align=left;spacingLeft=10;opacity=30;" parent="1" vertex="1">
<mxGeometry x="-1550" y="-810" width="800" height="380.5" as="geometry" />
</mxCell>
<mxCell id="_uGb1KgNCc7sdFown7Vx-46" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;strokeWidth=4;dashed=1;dashPattern=1 2;endArrow=none;endFill=0;curved=0;" parent="1" source="_uGb1KgNCc7sdFown7Vx-14" target="k4CSAVVTnt-oedxpcEqQ-79" edge="1">
Expand Down
10 changes: 5 additions & 5 deletions docs/guides/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Whenever you use `monaco-editor`/`@codingame/monaco-vscode-editor-api` `vscode`/
If you use pnpm or yarn, you have to add `vscode` / `@codingame/monaco-vscode-api` as direct dependency, otherwise the installation will fail:

```json
"vscode": "npm:@codingame/monaco-vscode-extension-api@^22.1.3"
"vscode": "npm:@codingame/monaco-vscode-extension-api@^22.1.4"
```

### Missing Overrides or Resolutions
Expand All @@ -23,7 +23,7 @@ To ensure all Monaco-related packages use a single, compatible version, you must
```json
{
"overrides": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^22.1.3"
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^22.1.4"
}
}
```
Expand All @@ -33,7 +33,7 @@ To ensure all Monaco-related packages use a single, compatible version, you must
```json
{
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^22.1.3"
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^22.1.4"
}
}
```
Expand All @@ -50,7 +50,7 @@ Additionally, if you see a message in the browser console starting with `Another

### @codingame/monaco-vscode-editor-api / monaco-editor usage

When you use the libraries from this project you are no longer required to proxy `monaco-editor` like `"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^22.1.3"` in you `package.json`. You can directly use it like so:
When you use the libraries from this project you are no longer required to proxy `monaco-editor` like `"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^22.1.4"` in you `package.json`. You can directly use it like so:

```js
import * as monaco from '@codingame/monaco-vscode-editor-api';
Expand All @@ -60,7 +60,7 @@ If your dependency stack already contains a reference `monaco-editor` you must e

```json
"overrides": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^22.1.3"
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^22.1.4"
}
```

Expand Down
26 changes: 13 additions & 13 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ If using npm or pnpm, and your dependencies already contain a refernence to `mon
```json
{
"overrides": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^22.1.3"
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^22.1.4"
}
}
```
Expand All @@ -57,7 +57,7 @@ In yarn you have to specify `resolutions` instead of `overrides`:
```json
{
"resolutions": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^22.1.3"
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@^22.1.4"
}
}
```
Expand All @@ -69,17 +69,17 @@ If using pnpm, you have to add more transitive dependencies that npm or yarn aut
```json
{
"dependencies": {
"@codingame/monaco-vscode-api": "^22.1.3",
"@codingame/monaco-vscode-configuration-service-override": "^22.1.3",
"@codingame/monaco-vscode-editor-api": "^22.1.3",
"@codingame/monaco-vscode-editor-service-override": "^22.1.3",
"@codingame/monaco-vscode-extension-api": "^22.1.3",
"@codingame/monaco-vscode-extensions-service-override": "^22.1.3",
"@codingame/monaco-vscode-languages-service-override": "^22.1.3",
"@codingame/monaco-vscode-localization-service-override": "^22.1.3",
"@codingame/monaco-vscode-log-service-override": "^22.1.3",
"@codingame/monaco-vscode-model-service-override": "^22.1.3",
"vscode": "npm:@codingame/monaco-vscode-extension-api@^22.1.3"
"@codingame/monaco-vscode-api": "^22.1.4",
"@codingame/monaco-vscode-configuration-service-override": "^22.1.4",
"@codingame/monaco-vscode-editor-api": "^22.1.4",
"@codingame/monaco-vscode-editor-service-override": "^22.1.4",
"@codingame/monaco-vscode-extension-api": "^22.1.4",
"@codingame/monaco-vscode-extensions-service-override": "^22.1.4",
"@codingame/monaco-vscode-languages-service-override": "^22.1.4",
"@codingame/monaco-vscode-localization-service-override": "^22.1.4",
"@codingame/monaco-vscode-log-service-override": "^22.1.4",
"@codingame/monaco-vscode-model-service-override": "^22.1.4",
"vscode": "npm:@codingame/monaco-vscode-extension-api@^22.1.4"
}
}
```
Expand Down
4 changes: 2 additions & 2 deletions docs/migration.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const vscodeApiConfig: MonacoVscodeApiConfig = {

## LanguageClientConfig(s)

The previous `languageClientConfigs` can now be expressed as single `LanguageClientConfig` to be directly used with `LanguageClientWrapper` or multiple language client configurations can be expressed in the `LanguageClientConfigs` and used with `LanguageClientsManager`. Obey, that `languageId` is now a mandatory property in `LanguageClientConfig`.
The previous `languageClientConfigs` can now be expressed as single `LanguageClientConfig` to be directly used with `LanguageClientWrapper` or multiple language client configurations can be expressed in the `LanguageClientConfigs` and used with `LanguageClientManager`. Obey, that `languageId` is now a mandatory property in `LanguageClientConfig`.

<table>
<tr><th>v9/v6</th><th>v10</th></tr>
Expand Down Expand Up @@ -181,7 +181,7 @@ await lcWrapper.start();
</td><td>

```ts
const lcManager = new LanguageClientsManager();
const lcManager = new LanguageClientManager();
const languageClientConfigs: LanguageClientConfigs = {
configs: {
myLang1: {
Expand Down
Loading