@marimo-team/frontend 0.25.1-dev27 → 0.25.1-dev28
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/__mocks__/common.ts +3 -3
- package/src/__tests__/CellStatus.test.tsx +1 -1
- package/src/__tests__/setup.ts +7 -7
- package/src/components/data-table/column-summary/chart-spec-model.tsx +4 -4
- package/src/components/dependency-graph/elements.ts +2 -2
- package/src/components/editor/ai/staged-cell-submission.ts +2 -2
- package/src/components/editor/ai/transport/chat-transport.tsx +1 -1
- package/src/components/editor/connections/database/as-code.ts +44 -44
- package/src/components/editor/connections/storage/as-code.ts +3 -3
- package/src/components/editor/file-tree/requesting-tree.tsx +16 -13
- package/src/components/editor/navigation/clipboard.ts +2 -2
- package/src/components/editor/output/ansi-reduce.ts +13 -13
- package/src/components/slides/__tests__/minimap-actions.test.tsx +7 -7
- package/src/components/slides/__tests__/minimap.test.ts +12 -12
- package/src/components/slides/__tests__/slide-scroll-hint.test.tsx +8 -8
- package/src/core/ai/context/__tests__/registry.test.ts +31 -28
- package/src/core/ai/context/providers/cell-output.ts +8 -8
- package/src/core/ai/context/providers/datasource.ts +10 -7
- package/src/core/ai/context/providers/error.ts +7 -7
- package/src/core/ai/context/providers/file.ts +8 -8
- package/src/core/ai/context/providers/tables.ts +7 -7
- package/src/core/ai/context/providers/variable.ts +7 -7
- package/src/core/ai/context/registry.ts +18 -18
- package/src/core/ai/ids/ids.ts +5 -5
- package/src/core/ai/model-registry.ts +12 -9
- package/src/core/ai/staged-cells.ts +6 -6
- package/src/core/ai/tools/base.ts +6 -6
- package/src/core/ai/tools/edit-notebook-tool.ts +6 -6
- package/src/core/ai/tools/registry.ts +4 -4
- package/src/core/ai/tools/run-cells-tool.ts +7 -7
- package/src/core/ai/tools/sample-tool.ts +6 -6
- package/src/core/codemirror/cells/debugger-decorations.ts +13 -7
- package/src/core/codemirror/cells/line-timing-decorations.ts +9 -9
- package/src/core/codemirror/cells/traceback-decorations.ts +7 -4
- package/src/core/codemirror/code-lens/extension.ts +13 -13
- package/src/core/codemirror/copilot/__tests__/language-server.test.ts +6 -6
- package/src/core/codemirror/copilot/__tests__/transport.test.ts +12 -12
- package/src/core/codemirror/copilot/language-server.ts +13 -13
- package/src/core/codemirror/copilot/transport.ts +1 -1
- package/src/core/codemirror/find-replace/search-highlight.ts +5 -5
- package/src/core/codemirror/go-to-definition/underline.ts +3 -3
- package/src/core/codemirror/keymaps/vim.ts +3 -3
- package/src/core/codemirror/language/languages/markdown.ts +8 -8
- package/src/core/codemirror/language/languages/python.ts +7 -7
- package/src/core/codemirror/language/languages/sql/completion-builder.ts +5 -5
- package/src/core/codemirror/language/languages/sql/completion-store.ts +4 -4
- package/src/core/codemirror/language/languages/sql/sql.ts +21 -21
- package/src/core/codemirror/lsp/__tests__/transports.test.ts +10 -10
- package/src/core/codemirror/lsp/federated-lsp.ts +29 -27
- package/src/core/codemirror/lsp/notebook-lsp.ts +21 -21
- package/src/core/codemirror/misc/__tests__/dnd.test.ts +10 -10
- package/src/core/codemirror/misc/__tests__/paste.test.ts +7 -4
- package/src/core/codemirror/reactive-references/extension.ts +3 -3
- package/src/core/codemirror/rtc/loro/awareness.ts +12 -12
- package/src/core/codemirror/rtc/loro/sync.ts +5 -5
- package/src/core/codemirror/vim/cursor-visibility.ts +3 -3
- package/src/core/dom/ui-element.ts +5 -5
- package/src/core/dom/uiregistry.ts +10 -10
- package/src/core/hotkeys/hotkeys.ts +9 -9
- package/src/core/islands/__tests__/bridge.test.ts +4 -4
- package/src/core/islands/__tests__/test-utils.tsx +4 -4
- package/src/core/islands/bridge.ts +85 -82
- package/src/core/islands/components/web-components.tsx +7 -7
- package/src/core/islands/worker/__tests__/controller.test.ts +1 -1
- package/src/core/islands/worker/controller.ts +6 -3
- package/src/core/islands/worker-factory.ts +2 -2
- package/src/core/kernel/RuntimeState.ts +4 -4
- package/src/core/lsp/__tests__/transport.test.ts +19 -19
- package/src/core/lsp/transport.ts +5 -5
- package/src/core/network/CachingRequestRegistry.ts +2 -2
- package/src/core/network/DeferredRequestRegistry.ts +4 -4
- package/src/core/runtime/runtime.ts +25 -20
- package/src/core/static/virtual-file-tracker.ts +5 -5
- package/src/core/wasm/__tests__/bridge.test.ts +2 -2
- package/src/core/wasm/bridge.ts +130 -126
- package/src/core/wasm/router.ts +5 -5
- package/src/core/wasm/store.ts +4 -4
- package/src/core/wasm/worker/bootstrap.ts +8 -5
- package/src/core/wasm/worker/message-buffer.ts +3 -3
- package/src/core/websocket/transports/__tests__/ws.test.ts +8 -8
- package/src/core/websocket/transports/basic.ts +15 -8
- package/src/core/websocket/transports/sse.ts +7 -7
- package/src/core/websocket/transports/transport.ts +3 -3
- package/src/core/websocket/transports/ws.ts +9 -7
- package/src/hooks/__tests__/useOverflowDetection.test.tsx +5 -5
- package/src/hooks/__tests__/useResizeObserver.test.tsx +12 -12
- package/src/plugins/core/registerReactComponent.tsx +5 -5
- package/src/plugins/core/sidebar-element.tsx +2 -2
- package/src/plugins/impl/ButtonPlugin.tsx +3 -3
- package/src/plugins/impl/CheckboxPlugin.tsx +3 -3
- package/src/plugins/impl/CodeEditorPlugin.tsx +3 -3
- package/src/plugins/impl/DatePickerPlugin.tsx +3 -3
- package/src/plugins/impl/DateRangePlugin.tsx +3 -3
- package/src/plugins/impl/DateTimePickerPlugin.tsx +3 -3
- package/src/plugins/impl/DictPlugin.tsx +3 -3
- package/src/plugins/impl/DropdownPlugin.tsx +3 -3
- package/src/plugins/impl/FileUploadPlugin.tsx +3 -3
- package/src/plugins/impl/MatrixPlugin.tsx +4 -4
- package/src/plugins/impl/MicrophonePlugin.tsx +3 -3
- package/src/plugins/impl/MultiselectPlugin.tsx +3 -3
- package/src/plugins/impl/NumberPlugin.tsx +3 -3
- package/src/plugins/impl/RadioPlugin.tsx +3 -3
- package/src/plugins/impl/RangeSliderPlugin.tsx +3 -3
- package/src/plugins/impl/RefreshPlugin.tsx +3 -3
- package/src/plugins/impl/SliderPlugin.tsx +3 -3
- package/src/plugins/impl/SwitchPlugin.tsx +3 -3
- package/src/plugins/impl/TabsPlugin.tsx +3 -3
- package/src/plugins/impl/TextAreaPlugin.tsx +3 -3
- package/src/plugins/impl/TextInputPlugin.tsx +3 -3
- package/src/plugins/impl/__tests__/MatrixPlugin.test.tsx +2 -2
- package/src/plugins/impl/anywidget/model.ts +10 -10
- package/src/plugins/impl/anywidget/registry.ts +12 -9
- package/src/plugins/impl/anywidget/runtime.ts +11 -9
- package/src/plugins/impl/anywidget/widget-binding.ts +6 -6
- package/src/plugins/impl/matplotlib/MatplotlibPlugin.tsx +3 -3
- package/src/plugins/impl/matplotlib/__tests__/matplotlib-renderer.test.ts +2 -2
- package/src/plugins/impl/matplotlib/matplotlib-renderer.ts +2 -2
- package/src/plugins/impl/mpl-interactive/mpl-websocket-shim.ts +10 -10
- package/src/plugins/impl/panel/utils.ts +5 -5
- package/src/plugins/impl/plotly/PlotlyPlugin.tsx +3 -3
- package/src/plugins/impl/vega/VegaPlugin.tsx +3 -3
- package/src/plugins/impl/vega/__tests__/use-vega-container-remeasure.test.ts +7 -7
- package/src/plugins/layout/AccordionPlugin.tsx +3 -3
- package/src/plugins/layout/CalloutPlugin.tsx +3 -3
- package/src/plugins/layout/ImageComparisonPlugin.tsx +5 -3
- package/src/plugins/layout/JsonOutputPlugin.tsx +3 -3
- package/src/plugins/layout/MimeRenderPlugin.tsx +3 -3
- package/src/plugins/layout/NavigationMenuPlugin.tsx +3 -3
- package/src/plugins/layout/OutlinePlugin.tsx +3 -3
- package/src/plugins/layout/ProgressPlugin.tsx +3 -3
- package/src/plugins/layout/RoutesPlugin.tsx +3 -3
- package/src/plugins/layout/StatPlugin.tsx +3 -3
- package/src/plugins/layout/TexPlugin.tsx +3 -3
- package/src/plugins/layout/carousel/CarouselPlugin.tsx +4 -4
- package/src/plugins/layout/mermaid/MermaidPlugin.tsx +3 -3
- package/src/utils/Deferred.ts +6 -6
- package/src/utils/async-capture-tracker.ts +10 -7
- package/src/utils/errors.ts +5 -5
- package/src/utils/id-tree.tsx +83 -80
- package/src/utils/lru.ts +1 -1
- package/src/utils/multi-map.ts +14 -12
- package/src/utils/paths.ts +6 -6
- package/src/utils/pluralize.ts +3 -3
- package/src/utils/progress.ts +6 -6
- package/src/utils/python-poet/poet.ts +14 -14
- package/src/utils/routes.ts +4 -2
- package/src/utils/semaphore.ts +6 -6
- package/src/utils/storage/storage.ts +6 -6
- package/src/utils/storage/typed.ts +16 -12
- package/src/utils/time.ts +9 -9
- package/src/utils/timed-cache.ts +4 -4
- package/src/utils/tracer.ts +9 -6
|
@@ -18,12 +18,12 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
18
18
|
private readonly clients: ILanguageServerClient[] = [];
|
|
19
19
|
public readonly documentUri: string;
|
|
20
20
|
|
|
21
|
-
constructor(clients: ILanguageServerClient[]) {
|
|
21
|
+
public constructor(clients: ILanguageServerClient[]) {
|
|
22
22
|
this.clients = clients;
|
|
23
23
|
this.documentUri = getLspDocumentUri();
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
onNotification(
|
|
26
|
+
public onNotification(
|
|
27
27
|
listener: (n: {
|
|
28
28
|
jsonrpc: "2.0";
|
|
29
29
|
id?: null | undefined;
|
|
@@ -43,7 +43,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
get clientCapabilities(): LSP.ClientCapabilities | undefined {
|
|
46
|
+
public get clientCapabilities(): LSP.ClientCapabilities | undefined {
|
|
47
47
|
const capabilities = this.clients
|
|
48
48
|
.map((client) => {
|
|
49
49
|
if (client.clientCapabilities) {
|
|
@@ -59,34 +59,34 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
59
59
|
return mergeDictsIgnoreFalsey<LSP.ClientCapabilities>(capabilities);
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
get ready(): boolean {
|
|
62
|
+
public get ready(): boolean {
|
|
63
63
|
return this.clients.some((client) => client.ready);
|
|
64
64
|
}
|
|
65
65
|
|
|
66
|
-
set ready(value: boolean) {
|
|
66
|
+
public set ready(value: boolean) {
|
|
67
67
|
this.clients.forEach((client) => {
|
|
68
68
|
client.ready = value;
|
|
69
69
|
});
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
-
get capabilities(): LSP.ServerCapabilities | null {
|
|
72
|
+
public get capabilities(): LSP.ServerCapabilities | null {
|
|
73
73
|
const capabilities = this.clients
|
|
74
74
|
.map((client) => client.capabilities)
|
|
75
75
|
.filter((c): c is LSP.ServerCapabilities => c !== null);
|
|
76
76
|
return mergeDictsIgnoreFalsey<LSP.ServerCapabilities>(capabilities);
|
|
77
77
|
}
|
|
78
78
|
|
|
79
|
-
set capabilities(value: LSP.ServerCapabilities) {
|
|
79
|
+
public set capabilities(value: LSP.ServerCapabilities) {
|
|
80
80
|
this.clients.forEach((client) => {
|
|
81
81
|
client.capabilities = value;
|
|
82
82
|
});
|
|
83
83
|
}
|
|
84
84
|
|
|
85
|
-
get initializePromise(): Promise<void> {
|
|
85
|
+
public get initializePromise(): Promise<void> {
|
|
86
86
|
return this.clients[0].initializePromise;
|
|
87
87
|
}
|
|
88
88
|
|
|
89
|
-
set initializePromise(value: Promise<void>) {
|
|
89
|
+
public set initializePromise(value: Promise<void>) {
|
|
90
90
|
this.clients.forEach((client) => {
|
|
91
91
|
client.initializePromise = value;
|
|
92
92
|
});
|
|
@@ -104,19 +104,19 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
104
104
|
return this.clients.filter((client) => client.hasCapability(method));
|
|
105
105
|
}
|
|
106
106
|
|
|
107
|
-
hasCapability(method: string): boolean {
|
|
107
|
+
public hasCapability(method: string): boolean {
|
|
108
108
|
return this.clients.some((client) => client.hasCapability(method));
|
|
109
109
|
}
|
|
110
110
|
|
|
111
|
-
async initialize(): Promise<void> {
|
|
111
|
+
public async initialize(): Promise<void> {
|
|
112
112
|
await Promise.all(this.clients.map((client) => client.initialize()));
|
|
113
113
|
}
|
|
114
114
|
|
|
115
|
-
async close(): Promise<void> {
|
|
115
|
+
public async close(): Promise<void> {
|
|
116
116
|
await Promise.all(this.clients.map((client) => client.close()));
|
|
117
117
|
}
|
|
118
118
|
|
|
119
|
-
async textDocumentDidChange(
|
|
119
|
+
public async textDocumentDidChange(
|
|
120
120
|
params: LSP.DidChangeTextDocumentParams,
|
|
121
121
|
): Promise<void> {
|
|
122
122
|
await Promise.all(
|
|
@@ -124,7 +124,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
124
124
|
);
|
|
125
125
|
}
|
|
126
126
|
|
|
127
|
-
async completionItemResolve(
|
|
127
|
+
public async completionItemResolve(
|
|
128
128
|
item: LSP.CompletionItem,
|
|
129
129
|
): Promise<LSP.CompletionItem> {
|
|
130
130
|
const client = this.firstWithMethod("textDocument/completion");
|
|
@@ -134,7 +134,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
134
134
|
return item;
|
|
135
135
|
}
|
|
136
136
|
|
|
137
|
-
async textDocumentCodeAction(
|
|
137
|
+
public async textDocumentCodeAction(
|
|
138
138
|
params: LSP.CodeActionParams,
|
|
139
139
|
): Promise<(LSP.Command | LSP.CodeAction)[] | null> {
|
|
140
140
|
const client = this.firstWithMethod("textDocument/codeAction");
|
|
@@ -144,12 +144,14 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
144
144
|
return null;
|
|
145
145
|
}
|
|
146
146
|
|
|
147
|
-
async codeActionResolve(
|
|
147
|
+
public async codeActionResolve(
|
|
148
|
+
action: LSP.CodeAction,
|
|
149
|
+
): Promise<LSP.CodeAction> {
|
|
148
150
|
const client = this.firstWithMethod("textDocument/codeAction");
|
|
149
151
|
return client ? client.codeActionResolve(action) : action;
|
|
150
152
|
}
|
|
151
153
|
|
|
152
|
-
async textDocumentRename(
|
|
154
|
+
public async textDocumentRename(
|
|
153
155
|
params: LSP.RenameParams,
|
|
154
156
|
): Promise<LSP.WorkspaceEdit | null> {
|
|
155
157
|
const client = this.firstWithMethod("textDocument/rename");
|
|
@@ -159,7 +161,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
159
161
|
return null;
|
|
160
162
|
}
|
|
161
163
|
|
|
162
|
-
async textDocumentPrepareRename(
|
|
164
|
+
public async textDocumentPrepareRename(
|
|
163
165
|
params: LSP.PrepareRenameParams,
|
|
164
166
|
): Promise<LSP.PrepareRenameResult | null> {
|
|
165
167
|
const client = this.firstWithMethod("textDocument/prepareRename");
|
|
@@ -169,7 +171,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
169
171
|
return null;
|
|
170
172
|
}
|
|
171
173
|
|
|
172
|
-
async textDocumentSignatureHelp(
|
|
174
|
+
public async textDocumentSignatureHelp(
|
|
173
175
|
params: LSP.SignatureHelpParams,
|
|
174
176
|
): Promise<LSP.SignatureHelp | null> {
|
|
175
177
|
const client = this.firstWithMethod("textDocument/signatureHelp");
|
|
@@ -180,7 +182,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
180
182
|
}
|
|
181
183
|
|
|
182
184
|
// Merge completions from all clients
|
|
183
|
-
async textDocumentCompletion(
|
|
185
|
+
public async textDocumentCompletion(
|
|
184
186
|
params: LSP.CompletionParams,
|
|
185
187
|
): Promise<LSP.CompletionList | LSP.CompletionItem[] | null> {
|
|
186
188
|
const clients = this.clientsWithMethod("textDocument/completion");
|
|
@@ -191,7 +193,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
191
193
|
return mergeCompletions(results);
|
|
192
194
|
}
|
|
193
195
|
|
|
194
|
-
async textDocumentDefinition(
|
|
196
|
+
public async textDocumentDefinition(
|
|
195
197
|
params: LSP.DefinitionParams,
|
|
196
198
|
): Promise<LSP.Definition | LSP.LocationLink[] | null> {
|
|
197
199
|
const client = this.firstWithMethod("textDocument/definition");
|
|
@@ -201,7 +203,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
201
203
|
return null;
|
|
202
204
|
}
|
|
203
205
|
|
|
204
|
-
async textDocumentDidOpen(
|
|
206
|
+
public async textDocumentDidOpen(
|
|
205
207
|
params: LSP.DidOpenTextDocumentParams,
|
|
206
208
|
): Promise<boolean> {
|
|
207
209
|
const results = await Promise.all(
|
|
@@ -211,7 +213,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
211
213
|
return results.some((result) => result !== false);
|
|
212
214
|
}
|
|
213
215
|
|
|
214
|
-
async textDocumentDidClose(
|
|
216
|
+
public async textDocumentDidClose(
|
|
215
217
|
params: LSP.DidCloseTextDocumentParams,
|
|
216
218
|
): Promise<void> {
|
|
217
219
|
await Promise.all(
|
|
@@ -219,7 +221,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
219
221
|
);
|
|
220
222
|
}
|
|
221
223
|
|
|
222
|
-
async textDocumentWillSave(
|
|
224
|
+
public async textDocumentWillSave(
|
|
223
225
|
params: LSP.WillSaveTextDocumentParams,
|
|
224
226
|
): Promise<void> {
|
|
225
227
|
await Promise.all(
|
|
@@ -227,7 +229,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
227
229
|
);
|
|
228
230
|
}
|
|
229
231
|
|
|
230
|
-
async textDocumentWillSaveWaitUntil(
|
|
232
|
+
public async textDocumentWillSaveWaitUntil(
|
|
231
233
|
params: LSP.WillSaveTextDocumentParams,
|
|
232
234
|
): Promise<LSP.TextEdit[] | null> {
|
|
233
235
|
// This blocks the save, so query concurrently rather than paying the sum of
|
|
@@ -247,7 +249,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
247
249
|
return null;
|
|
248
250
|
}
|
|
249
251
|
|
|
250
|
-
async textDocumentDidSave(
|
|
252
|
+
public async textDocumentDidSave(
|
|
251
253
|
params: LSP.DidSaveTextDocumentParams,
|
|
252
254
|
): Promise<void> {
|
|
253
255
|
await Promise.all(
|
|
@@ -255,7 +257,7 @@ export class FederatedLanguageServerClient implements ILanguageServerClient {
|
|
|
255
257
|
);
|
|
256
258
|
}
|
|
257
259
|
|
|
258
|
-
async textDocumentHover(params: LSP.HoverParams): Promise<LSP.Hover> {
|
|
260
|
+
public async textDocumentHover(params: LSP.HoverParams): Promise<LSP.Hover> {
|
|
259
261
|
for (const client of this.clients) {
|
|
260
262
|
if (!client.hasCapability("textDocument/hover")) {
|
|
261
263
|
continue;
|
|
@@ -42,7 +42,7 @@ class Snapshotter {
|
|
|
42
42
|
codes: Record<CellId, string>;
|
|
43
43
|
};
|
|
44
44
|
|
|
45
|
-
constructor(
|
|
45
|
+
public constructor(
|
|
46
46
|
getNotebookCode: () => {
|
|
47
47
|
cellIds: CellId[];
|
|
48
48
|
codes: Record<CellId, string>;
|
|
@@ -226,7 +226,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
|
|
|
226
226
|
private latestDiagnosticsVersion: number | null = null;
|
|
227
227
|
private forwardedDiagnosticsVersion = 0;
|
|
228
228
|
|
|
229
|
-
constructor(
|
|
229
|
+
public constructor(
|
|
230
230
|
client: ILanguageServerClient,
|
|
231
231
|
initialSettings: Record<string, unknown>,
|
|
232
232
|
getNotebookEditors: () => Record<
|
|
@@ -254,7 +254,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
|
|
|
254
254
|
this.snapshotter = new Snapshotter(this.getNotebookCode.bind(this));
|
|
255
255
|
}
|
|
256
256
|
|
|
257
|
-
onNotification(
|
|
257
|
+
public onNotification(
|
|
258
258
|
listener: (n: {
|
|
259
259
|
jsonrpc: "2.0";
|
|
260
260
|
id?: null | undefined;
|
|
@@ -265,44 +265,44 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
|
|
|
265
265
|
return this.client.onNotification(listener);
|
|
266
266
|
}
|
|
267
267
|
|
|
268
|
-
get ready(): boolean {
|
|
268
|
+
public get ready(): boolean {
|
|
269
269
|
return this.client.ready;
|
|
270
270
|
}
|
|
271
271
|
|
|
272
|
-
set ready(value: boolean) {
|
|
272
|
+
public set ready(value: boolean) {
|
|
273
273
|
this.client.ready = value;
|
|
274
274
|
}
|
|
275
275
|
|
|
276
|
-
get capabilities(): LSP.ServerCapabilities | null {
|
|
276
|
+
public get capabilities(): LSP.ServerCapabilities | null {
|
|
277
277
|
return this.client.capabilities;
|
|
278
278
|
}
|
|
279
279
|
|
|
280
|
-
set capabilities(value: LSP.ServerCapabilities) {
|
|
280
|
+
public set capabilities(value: LSP.ServerCapabilities) {
|
|
281
281
|
this.client.capabilities = value;
|
|
282
282
|
}
|
|
283
283
|
|
|
284
|
-
get initializePromise(): Promise<void> {
|
|
284
|
+
public get initializePromise(): Promise<void> {
|
|
285
285
|
return this.client.initializePromise;
|
|
286
286
|
}
|
|
287
287
|
|
|
288
|
-
set initializePromise(value: Promise<void>) {
|
|
288
|
+
public set initializePromise(value: Promise<void>) {
|
|
289
289
|
this.client.initializePromise = value;
|
|
290
290
|
}
|
|
291
291
|
|
|
292
|
-
get clientCapabilities() {
|
|
292
|
+
public get clientCapabilities() {
|
|
293
293
|
return this.client.clientCapabilities;
|
|
294
294
|
}
|
|
295
295
|
|
|
296
|
-
async initialize(): Promise<void> {
|
|
296
|
+
public async initialize(): Promise<void> {
|
|
297
297
|
await this.client.initialize();
|
|
298
298
|
}
|
|
299
299
|
|
|
300
|
-
close(): void {
|
|
300
|
+
public close(): void {
|
|
301
301
|
this.openCellDocumentCounts.clear();
|
|
302
302
|
this.client.close();
|
|
303
303
|
}
|
|
304
304
|
|
|
305
|
-
hasCapability(method: string): boolean {
|
|
305
|
+
public hasCapability(method: string): boolean {
|
|
306
306
|
return this.client.hasCapability(method);
|
|
307
307
|
}
|
|
308
308
|
|
|
@@ -430,7 +430,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
|
|
|
430
430
|
* This ensures the caller uses the same lens that was sent to the server,
|
|
431
431
|
* avoiding race conditions if cells change between sync and subsequent operations.
|
|
432
432
|
*/
|
|
433
|
-
async sync(): Promise<{
|
|
433
|
+
public async sync(): Promise<{
|
|
434
434
|
params: LSP.DidChangeTextDocumentParams;
|
|
435
435
|
lens: NotebookLens;
|
|
436
436
|
}> {
|
|
@@ -499,7 +499,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
|
|
|
499
499
|
});
|
|
500
500
|
}
|
|
501
501
|
|
|
502
|
-
async textDocumentDefinition(
|
|
502
|
+
public async textDocumentDefinition(
|
|
503
503
|
params: LSP.DefinitionParams,
|
|
504
504
|
): Promise<LSP.Definition | LSP.LocationLink[] | null> {
|
|
505
505
|
// Get the cell document URI from the params
|
|
@@ -525,7 +525,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
|
|
|
525
525
|
});
|
|
526
526
|
}
|
|
527
527
|
|
|
528
|
-
async textDocumentSignatureHelp(
|
|
528
|
+
public async textDocumentSignatureHelp(
|
|
529
529
|
params: LSP.SignatureHelpParams,
|
|
530
530
|
): Promise<LSP.SignatureHelp | null> {
|
|
531
531
|
const cellDocumentUri = params.textDocument.uri;
|
|
@@ -572,7 +572,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
|
|
|
572
572
|
*
|
|
573
573
|
* See textDocumentRename for a similar workaround that manually applies edits.
|
|
574
574
|
*/
|
|
575
|
-
textDocumentCodeAction(
|
|
575
|
+
public textDocumentCodeAction(
|
|
576
576
|
params: LSP.CodeActionParams,
|
|
577
577
|
): Promise<(LSP.Command | LSP.CodeAction)[] | null> {
|
|
578
578
|
const disabledCodeAction = true;
|
|
@@ -582,7 +582,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
|
|
|
582
582
|
return this.client.textDocumentCodeAction(params);
|
|
583
583
|
}
|
|
584
584
|
|
|
585
|
-
codeActionResolve(action: LSP.CodeAction): Promise<LSP.CodeAction> {
|
|
585
|
+
public codeActionResolve(action: LSP.CodeAction): Promise<LSP.CodeAction> {
|
|
586
586
|
return Promise.resolve(action);
|
|
587
587
|
}
|
|
588
588
|
|
|
@@ -646,7 +646,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
|
|
|
646
646
|
* LSP edit application flow. The trade-off is that we lose undo grouping
|
|
647
647
|
* across cells.
|
|
648
648
|
*/
|
|
649
|
-
async textDocumentRename(
|
|
649
|
+
public async textDocumentRename(
|
|
650
650
|
params: LSP.RenameParams,
|
|
651
651
|
): Promise<LSP.WorkspaceEdit | null> {
|
|
652
652
|
// Get the cell document URI from the params
|
|
@@ -784,7 +784,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
|
|
|
784
784
|
};
|
|
785
785
|
}
|
|
786
786
|
|
|
787
|
-
async completionItemResolve(
|
|
787
|
+
public async completionItemResolve(
|
|
788
788
|
params: LSP.CompletionItem,
|
|
789
789
|
): Promise<LSP.CompletionItem> {
|
|
790
790
|
// Used cached result to avoid jitter while typing in the same completion item
|
|
@@ -801,7 +801,7 @@ export class NotebookLanguageServerClient implements ILanguageServerClient {
|
|
|
801
801
|
return resolved;
|
|
802
802
|
}
|
|
803
803
|
|
|
804
|
-
async textDocumentPrepareRename(
|
|
804
|
+
public async textDocumentPrepareRename(
|
|
805
805
|
params: LSP.PrepareRenameParams,
|
|
806
806
|
): Promise<LSP.PrepareRenameResult | null> {
|
|
807
807
|
// Get the cell document URI from the params
|
|
@@ -66,11 +66,11 @@ describe("dnd", () => {
|
|
|
66
66
|
});
|
|
67
67
|
|
|
68
68
|
class DragEvent extends Event {
|
|
69
|
-
dataTransfer: DataTransfer;
|
|
70
|
-
clientX: number;
|
|
71
|
-
clientY: number;
|
|
69
|
+
public dataTransfer: DataTransfer;
|
|
70
|
+
public clientX: number;
|
|
71
|
+
public clientY: number;
|
|
72
72
|
|
|
73
|
-
constructor(
|
|
73
|
+
public constructor(
|
|
74
74
|
type: string,
|
|
75
75
|
{
|
|
76
76
|
dataTransfer,
|
|
@@ -86,14 +86,14 @@ class DragEvent extends Event {
|
|
|
86
86
|
}
|
|
87
87
|
|
|
88
88
|
class DataTransfer {
|
|
89
|
-
data: Record<string, string> = {};
|
|
90
|
-
_items: File[] = [];
|
|
89
|
+
public data: Record<string, string> = {};
|
|
90
|
+
public _items: File[] = [];
|
|
91
91
|
|
|
92
|
-
setData(type: string, data: string) {
|
|
92
|
+
public setData(type: string, data: string) {
|
|
93
93
|
this.data[type] = data;
|
|
94
94
|
}
|
|
95
95
|
|
|
96
|
-
get items() {
|
|
96
|
+
public get items() {
|
|
97
97
|
return {
|
|
98
98
|
add: (file: File) => {
|
|
99
99
|
this._items.push(file);
|
|
@@ -101,11 +101,11 @@ class DataTransfer {
|
|
|
101
101
|
};
|
|
102
102
|
}
|
|
103
103
|
|
|
104
|
-
get files() {
|
|
104
|
+
public get files() {
|
|
105
105
|
return this._items;
|
|
106
106
|
}
|
|
107
107
|
|
|
108
|
-
getData(type: string) {
|
|
108
|
+
public getData(type: string) {
|
|
109
109
|
return this.data[type];
|
|
110
110
|
}
|
|
111
111
|
}
|
|
@@ -320,17 +320,20 @@ def foo():
|
|
|
320
320
|
// Mock ClipboardEvent and DataTransfer
|
|
321
321
|
class MockDataTransfer {
|
|
322
322
|
private data: Record<string, string> = {};
|
|
323
|
-
setData(format: string, data: string) {
|
|
323
|
+
public setData(format: string, data: string) {
|
|
324
324
|
this.data[format] = data;
|
|
325
325
|
}
|
|
326
|
-
getData(format: string) {
|
|
326
|
+
public getData(format: string) {
|
|
327
327
|
return this.data[format];
|
|
328
328
|
}
|
|
329
329
|
}
|
|
330
330
|
|
|
331
331
|
class MockClipboardEvent extends Event {
|
|
332
|
-
clipboardData: MockDataTransfer;
|
|
333
|
-
constructor(
|
|
332
|
+
public clipboardData: MockDataTransfer;
|
|
333
|
+
public constructor(
|
|
334
|
+
type: string,
|
|
335
|
+
init?: { clipboardData?: MockDataTransfer },
|
|
336
|
+
) {
|
|
334
337
|
super(type);
|
|
335
338
|
this.clipboardData = init?.clipboardData || new MockDataTransfer();
|
|
336
339
|
}
|
|
@@ -50,7 +50,7 @@ class ReactiveReferencesPlugin {
|
|
|
50
50
|
// Debounced function to trigger highlighting
|
|
51
51
|
private readonly scheduleHighlighting: DebouncedFunc<() => void>;
|
|
52
52
|
|
|
53
|
-
constructor(view: EditorView, cellId: CellId) {
|
|
53
|
+
public constructor(view: EditorView, cellId: CellId) {
|
|
54
54
|
this.view = view;
|
|
55
55
|
this.cellId = cellId;
|
|
56
56
|
|
|
@@ -67,13 +67,13 @@ class ReactiveReferencesPlugin {
|
|
|
67
67
|
this.scheduleHighlighting();
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
update(update: ViewUpdate) {
|
|
70
|
+
public update(update: ViewUpdate) {
|
|
71
71
|
if (update.docChanged || update.focusChanged) {
|
|
72
72
|
this.scheduleHighlighting();
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
destroy() {
|
|
76
|
+
public destroy() {
|
|
77
77
|
this.scheduleHighlighting.cancel();
|
|
78
78
|
this.variablesUnsubscribe();
|
|
79
79
|
}
|
|
@@ -208,7 +208,7 @@ export class RemoteCursorMarker implements LayerMarker {
|
|
|
208
208
|
private name: string;
|
|
209
209
|
private colorClassName: string;
|
|
210
210
|
|
|
211
|
-
constructor(
|
|
211
|
+
public constructor(
|
|
212
212
|
left: number,
|
|
213
213
|
top: number,
|
|
214
214
|
height: number,
|
|
@@ -222,18 +222,18 @@ export class RemoteCursorMarker implements LayerMarker {
|
|
|
222
222
|
this.colorClassName = colorClassName;
|
|
223
223
|
}
|
|
224
224
|
|
|
225
|
-
draw(): HTMLElement {
|
|
225
|
+
public draw(): HTMLElement {
|
|
226
226
|
const elt = document.createElement("div");
|
|
227
227
|
this.adjust(elt);
|
|
228
228
|
return elt;
|
|
229
229
|
}
|
|
230
230
|
|
|
231
|
-
update(elt: HTMLElement): boolean {
|
|
231
|
+
public update(elt: HTMLElement): boolean {
|
|
232
232
|
this.adjust(elt);
|
|
233
233
|
return true;
|
|
234
234
|
}
|
|
235
235
|
|
|
236
|
-
adjust(element: HTMLElement) {
|
|
236
|
+
public adjust(element: HTMLElement) {
|
|
237
237
|
element.style.left = `${this.left}px`;
|
|
238
238
|
element.style.top = `${this.top}px`;
|
|
239
239
|
element.style.height = `${this.height}px`;
|
|
@@ -241,7 +241,7 @@ export class RemoteCursorMarker implements LayerMarker {
|
|
|
241
241
|
element.style.setProperty("--rtc-name", `"${this.name}"`);
|
|
242
242
|
}
|
|
243
243
|
|
|
244
|
-
eq(other: RemoteCursorMarker): boolean {
|
|
244
|
+
public eq(other: RemoteCursorMarker): boolean {
|
|
245
245
|
return (
|
|
246
246
|
this.left === other.left &&
|
|
247
247
|
this.top === other.top &&
|
|
@@ -364,7 +364,7 @@ export interface CursorPosition {
|
|
|
364
364
|
}
|
|
365
365
|
|
|
366
366
|
export class AwarenessPlugin implements PluginValue {
|
|
367
|
-
sub: Subscription;
|
|
367
|
+
public sub: Subscription;
|
|
368
368
|
public view: EditorView;
|
|
369
369
|
public doc: LoroDoc;
|
|
370
370
|
public user: UserState;
|
|
@@ -373,7 +373,7 @@ export class AwarenessPlugin implements PluginValue {
|
|
|
373
373
|
private scopeId: ScopeId;
|
|
374
374
|
private getUserId?: () => Uid;
|
|
375
375
|
|
|
376
|
-
constructor(
|
|
376
|
+
public constructor(
|
|
377
377
|
view: EditorView,
|
|
378
378
|
doc: LoroDoc,
|
|
379
379
|
user: UserState,
|
|
@@ -421,7 +421,7 @@ export class AwarenessPlugin implements PluginValue {
|
|
|
421
421
|
});
|
|
422
422
|
}
|
|
423
423
|
|
|
424
|
-
update(update: ViewUpdate): void {
|
|
424
|
+
public update(update: ViewUpdate): void {
|
|
425
425
|
if (!update.selectionSet && !update.focusChanged && !update.docChanged) {
|
|
426
426
|
return;
|
|
427
427
|
}
|
|
@@ -450,7 +450,7 @@ export class AwarenessPlugin implements PluginValue {
|
|
|
450
450
|
}
|
|
451
451
|
}
|
|
452
452
|
|
|
453
|
-
destroy(): void {
|
|
453
|
+
public destroy(): void {
|
|
454
454
|
this.sub?.();
|
|
455
455
|
this.awareness.setLocalState({
|
|
456
456
|
type: "delete",
|
|
@@ -460,13 +460,13 @@ export class AwarenessPlugin implements PluginValue {
|
|
|
460
460
|
}
|
|
461
461
|
}
|
|
462
462
|
export class RemoteAwarenessPlugin implements PluginValue {
|
|
463
|
-
_awarenessListener?: AwarenessListener;
|
|
463
|
+
public _awarenessListener?: AwarenessListener;
|
|
464
464
|
public view: EditorView;
|
|
465
465
|
public doc: LoroDoc;
|
|
466
466
|
public awareness: Awareness<AwarenessState>;
|
|
467
467
|
private scopeId: ScopeId;
|
|
468
468
|
|
|
469
|
-
constructor(
|
|
469
|
+
public constructor(
|
|
470
470
|
view: EditorView,
|
|
471
471
|
doc: LoroDoc,
|
|
472
472
|
awareness: Awareness<AwarenessState>,
|
|
@@ -493,7 +493,7 @@ export class RemoteAwarenessPlugin implements PluginValue {
|
|
|
493
493
|
this.awareness.addListener(listener);
|
|
494
494
|
}
|
|
495
495
|
|
|
496
|
-
destroy(): void {
|
|
496
|
+
public destroy(): void {
|
|
497
497
|
if (this._awarenessListener) {
|
|
498
498
|
this.awareness.removeListener(this._awarenessListener);
|
|
499
499
|
}
|
|
@@ -38,14 +38,14 @@ export const loroSyncPlugin = (
|
|
|
38
38
|
export const loroSyncAnnotation = Annotation.define();
|
|
39
39
|
|
|
40
40
|
export class LoroSyncPluginValue implements PluginValue {
|
|
41
|
-
sub?: Subscription;
|
|
41
|
+
public sub?: Subscription;
|
|
42
42
|
private isInitDispatch = false;
|
|
43
43
|
private view: EditorView;
|
|
44
44
|
private doc: LoroDoc;
|
|
45
45
|
private docPath: string[];
|
|
46
46
|
private getTextFromDoc: (doc: LoroDoc) => LoroText;
|
|
47
47
|
|
|
48
|
-
constructor(
|
|
48
|
+
public constructor(
|
|
49
49
|
view: EditorView,
|
|
50
50
|
doc: LoroDoc,
|
|
51
51
|
docPath: string[],
|
|
@@ -77,7 +77,7 @@ export class LoroSyncPluginValue implements PluginValue {
|
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
-
onRemoteUpdate = (e: LoroEventBatch) => {
|
|
80
|
+
public onRemoteUpdate = (e: LoroEventBatch) => {
|
|
81
81
|
if (e.by === "local") {
|
|
82
82
|
return;
|
|
83
83
|
}
|
|
@@ -133,7 +133,7 @@ export class LoroSyncPluginValue implements PluginValue {
|
|
|
133
133
|
}
|
|
134
134
|
};
|
|
135
135
|
|
|
136
|
-
update(update: ViewUpdate): void {
|
|
136
|
+
public update(update: ViewUpdate): void {
|
|
137
137
|
if (this.isInitDispatch) {
|
|
138
138
|
this.isInitDispatch = false;
|
|
139
139
|
return;
|
|
@@ -161,7 +161,7 @@ export class LoroSyncPluginValue implements PluginValue {
|
|
|
161
161
|
this.doc.commit();
|
|
162
162
|
}
|
|
163
163
|
|
|
164
|
-
destroy(): void {
|
|
164
|
+
public destroy(): void {
|
|
165
165
|
this.sub?.();
|
|
166
166
|
this.sub = undefined;
|
|
167
167
|
}
|
|
@@ -23,7 +23,7 @@ export class VimCursorVisibilityPlugin implements PluginValue {
|
|
|
23
23
|
private view: EditorView;
|
|
24
24
|
private abortController = new AbortController();
|
|
25
25
|
|
|
26
|
-
constructor(options: VimCursorVisibilityPluginOptions) {
|
|
26
|
+
public constructor(options: VimCursorVisibilityPluginOptions) {
|
|
27
27
|
this.view = options.view;
|
|
28
28
|
this.view.dom.addEventListener(
|
|
29
29
|
"focus",
|
|
@@ -38,7 +38,7 @@ export class VimCursorVisibilityPlugin implements PluginValue {
|
|
|
38
38
|
this.update();
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
-
update() {
|
|
41
|
+
public update() {
|
|
42
42
|
const vimCursorLayer = this.view.dom.querySelector(".cm-vimCursorLayer");
|
|
43
43
|
if (vimCursorLayer instanceof HTMLElement) {
|
|
44
44
|
// Hide all vim cursors when in command mode
|
|
@@ -52,7 +52,7 @@ export class VimCursorVisibilityPlugin implements PluginValue {
|
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
-
destroy(): void {
|
|
55
|
+
public destroy(): void {
|
|
56
56
|
this.abortController.abort();
|
|
57
57
|
}
|
|
58
58
|
}
|
|
@@ -137,7 +137,7 @@ export function initializeUIElement() {
|
|
|
137
137
|
this.initialized = true;
|
|
138
138
|
}
|
|
139
139
|
|
|
140
|
-
connectedCallback() {
|
|
140
|
+
public connectedCallback() {
|
|
141
141
|
this.init();
|
|
142
142
|
|
|
143
143
|
if (this.initialized) {
|
|
@@ -157,7 +157,7 @@ export function initializeUIElement() {
|
|
|
157
157
|
}
|
|
158
158
|
}
|
|
159
159
|
|
|
160
|
-
disconnectedCallback() {
|
|
160
|
+
public disconnectedCallback() {
|
|
161
161
|
if (this.initialized) {
|
|
162
162
|
// Unregister everything
|
|
163
163
|
document.removeEventListener(
|
|
@@ -175,7 +175,7 @@ export function initializeUIElement() {
|
|
|
175
175
|
/**
|
|
176
176
|
* Reset the value of the child element to its initial value.
|
|
177
177
|
*/
|
|
178
|
-
reset() {
|
|
178
|
+
public reset() {
|
|
179
179
|
const child = this.firstElementChild;
|
|
180
180
|
if (isCustomMarimoElement(child)) {
|
|
181
181
|
child.reset();
|
|
@@ -189,11 +189,11 @@ export function initializeUIElement() {
|
|
|
189
189
|
// We look for changes to the random-id attribute, which is effectively
|
|
190
190
|
// used like a React key. If the random-id changes, we need to unmount and
|
|
191
191
|
// remount its child.
|
|
192
|
-
static get observedAttributes() {
|
|
192
|
+
public static get observedAttributes() {
|
|
193
193
|
return [RANDOM_ID_ATTR];
|
|
194
194
|
}
|
|
195
195
|
|
|
196
|
-
attributeChangedCallback(
|
|
196
|
+
public attributeChangedCallback(
|
|
197
197
|
name: string,
|
|
198
198
|
oldValue: string | null,
|
|
199
199
|
newValue: string | null,
|