feat(pbs): resolve editorial chains and expose read-only external sources
This commit is contained in:
@@ -37,6 +37,7 @@ exports.activate = activate;
|
||||
exports.deactivate = deactivate;
|
||||
const net = __importStar(require("node:net"));
|
||||
const vscode = __importStar(require("vscode"));
|
||||
const externalSources_1 = require("./externalSources");
|
||||
const node_1 = require("vscode-languageclient/node");
|
||||
let client;
|
||||
let output;
|
||||
@@ -44,12 +45,14 @@ let reconnectTimer;
|
||||
let reconnectContext;
|
||||
let stoppingClient = false;
|
||||
let lastAppliedThemeSignature;
|
||||
const externalSources = new externalSources_1.ExternalSources();
|
||||
const RECONNECT_DELAY_MS = 2000;
|
||||
const VSCODE_HOST_ID = "vscode";
|
||||
function activate(context) {
|
||||
reconnectContext = context;
|
||||
output = vscode.window.createOutputChannel("Prometeu LSP");
|
||||
output.appendLine("Prometeu VS Code extension activated.");
|
||||
context.subscriptions.push(externalSources, vscode.workspace.registerTextDocumentContentProvider(externalSources_1.externalScheme, externalSources), vscode.window.onDidChangeActiveTextEditor(() => externalSources.refreshStatus()), vscode.workspace.onDidOpenTextDocument(document => void externalSources.opened(document)), vscode.workspace.onDidCloseTextDocument(document => void externalSources.closeDocument(document)));
|
||||
const connectCommand = vscode.commands.registerCommand("prometeu.connectStudioLsp", async () => {
|
||||
await startClient(context);
|
||||
});
|
||||
@@ -61,7 +64,12 @@ function activate(context) {
|
||||
void startClient(context);
|
||||
}
|
||||
async function deactivate() {
|
||||
await stopClient();
|
||||
try {
|
||||
await externalSources.shutdown();
|
||||
}
|
||||
finally {
|
||||
await stopClient();
|
||||
}
|
||||
}
|
||||
async function startClient(context) {
|
||||
clearReconnectTimer();
|
||||
@@ -113,7 +121,7 @@ async function startClient(context) {
|
||||
{
|
||||
scheme: "file",
|
||||
language: "pbs"
|
||||
}
|
||||
}, { scheme: externalSources_1.externalScheme, language: "pbs" }
|
||||
],
|
||||
synchronize: {
|
||||
fileEvents: [
|
||||
@@ -121,10 +129,20 @@ async function startClient(context) {
|
||||
]
|
||||
},
|
||||
initializationOptions: {
|
||||
...externalSources.initializationOptions,
|
||||
clientKind: "vscode",
|
||||
prometeuClientVersion: context.extension.packageJSON.version
|
||||
},
|
||||
outputChannel: output,
|
||||
middleware: {
|
||||
prepareRename: (document, position, token, next) => document.uri.scheme === externalSources_1.externalScheme ? null : next(document, position, token),
|
||||
provideRenameEdits: (document, position, name, token, next) => document.uri.scheme === externalSources_1.externalScheme ? null : next(document, position, name, token),
|
||||
provideDocumentFormattingEdits: (document, options, token, next) => document.uri.scheme === externalSources_1.externalScheme ? [] : next(document, options, token),
|
||||
provideCodeActions: (document, range, context, token, next) => document.uri.scheme === externalSources_1.externalScheme ? [] : next(document, range, context, token),
|
||||
provideHover: (document, position, token, next) => externalSources.canQuery(document) ? next(document, position, token) : null,
|
||||
provideDefinition: (document, position, token, next) => externalSources.canQuery(document) ? next(document, position, token) : null,
|
||||
provideDocumentSemanticTokens: (document, token, next) => externalSources.canQuery(document) ? next(document, token) : null
|
||||
},
|
||||
errorHandler: {
|
||||
error: (error) => {
|
||||
output.appendLine(`Prometeu LSP transport error: ${error.message}`);
|
||||
@@ -138,11 +156,18 @@ async function startClient(context) {
|
||||
};
|
||||
const nextClient = new node_1.LanguageClient("prometeuStudioLsp", "Prometeu Studio LSP", serverOptions, clientOptions);
|
||||
client = nextClient;
|
||||
nextClient.registerFeature({
|
||||
fillClientCapabilities(capabilities) {
|
||||
capabilities.experimental = { ...capabilities.experimental, prometeuExternalSources: true };
|
||||
},
|
||||
initialize() { }, clear() { }, getState() { return { kind: "static" }; }
|
||||
});
|
||||
nextClient.onDidChangeState((event) => {
|
||||
output.appendLine(`Prometeu LSP state changed: ${node_1.State[event.oldState]} -> ${node_1.State[event.newState]}`);
|
||||
if (event.newState !== node_1.State.Stopped) {
|
||||
return;
|
||||
}
|
||||
externalSources.disconnected();
|
||||
if (client === nextClient) {
|
||||
client = undefined;
|
||||
}
|
||||
@@ -152,11 +177,13 @@ async function startClient(context) {
|
||||
});
|
||||
try {
|
||||
await nextClient.start();
|
||||
await externalSources.connected(nextClient);
|
||||
await applyPrometeuVisualTheme(nextClient.initializeResult);
|
||||
output.appendLine("Prometeu Studio LSP client started.");
|
||||
vscode.window.showInformationMessage("Connected to Prometeu Studio LSP.");
|
||||
}
|
||||
catch (error) {
|
||||
externalSources.resetSession();
|
||||
if (client === nextClient) {
|
||||
client = undefined;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,146 @@
|
||||
"use strict";
|
||||
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
||||
if (k2 === undefined) k2 = k;
|
||||
var desc = Object.getOwnPropertyDescriptor(m, k);
|
||||
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
||||
desc = { enumerable: true, get: function() { return m[k]; } };
|
||||
}
|
||||
Object.defineProperty(o, k2, desc);
|
||||
}) : (function(o, m, k, k2) {
|
||||
if (k2 === undefined) k2 = k;
|
||||
o[k2] = m[k];
|
||||
}));
|
||||
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
||||
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
||||
}) : function(o, v) {
|
||||
o["default"] = v;
|
||||
});
|
||||
var __importStar = (this && this.__importStar) || (function () {
|
||||
var ownKeys = function(o) {
|
||||
ownKeys = Object.getOwnPropertyNames || function (o) {
|
||||
var ar = [];
|
||||
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
||||
return ar;
|
||||
};
|
||||
return ownKeys(o);
|
||||
};
|
||||
return function (mod) {
|
||||
if (mod && mod.__esModule) return mod;
|
||||
var result = {};
|
||||
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
||||
__setModuleDefault(result, mod);
|
||||
return result;
|
||||
};
|
||||
})();
|
||||
Object.defineProperty(exports, "__esModule", { value: true });
|
||||
exports.ExternalSources = exports.externalScheme = void 0;
|
||||
const vscode = __importStar(require("vscode"));
|
||||
exports.externalScheme = "prometeu-source";
|
||||
/** Immutable virtual documents. No filesystem provider and no content-change events. */
|
||||
class ExternalSources {
|
||||
client;
|
||||
consumerId;
|
||||
documents = new Map();
|
||||
available = new Set();
|
||||
closed = new Set();
|
||||
status = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, 10);
|
||||
refreshStatus() {
|
||||
const document = vscode.window.activeTextEditor?.document;
|
||||
if (document?.uri.scheme === exports.externalScheme && !this.canQuery(document)) {
|
||||
this.status.text = "Prometeu: external source unavailable";
|
||||
this.status.tooltip = "Reconnect to Studio or navigate again to obtain the current source revision.";
|
||||
this.status.show();
|
||||
}
|
||||
else
|
||||
this.status.hide();
|
||||
}
|
||||
get initializationOptions() {
|
||||
return this.consumerId ? { prometeuExternalConsumerId: this.consumerId } : {};
|
||||
}
|
||||
canQuery(document) {
|
||||
const uri = document.uri;
|
||||
if (uri.scheme !== exports.externalScheme)
|
||||
return true;
|
||||
const content = this.documents.get(uri.toString());
|
||||
return !!this.client && this.available.has(uri.toString()) && !!content
|
||||
&& document.getText().replace(/\r\n?/g, "\n") === content.text.replace(/\r\n?/g, "\n");
|
||||
}
|
||||
async connected(client) {
|
||||
const experimental = client.initializeResult?.capabilities.experimental;
|
||||
if (!experimental?.prometeuExternalSources)
|
||||
return;
|
||||
this.client = client;
|
||||
this.consumerId = experimental.prometeuExternalConsumerId;
|
||||
for (const uri of this.closed)
|
||||
await this.release(uri);
|
||||
this.closed.clear();
|
||||
for (const [uri, old] of this.documents) {
|
||||
try {
|
||||
const current = await this.request("revalidateExternalSource", uri);
|
||||
if (current.descriptor.revision === old.descriptor.revision && current.text === old.text)
|
||||
this.available.add(uri);
|
||||
}
|
||||
catch { /* Keep displayed text; fresh navigation is required. */ }
|
||||
}
|
||||
this.refreshStatus();
|
||||
}
|
||||
disconnected() { this.client = undefined; this.available.clear(); this.refreshStatus(); }
|
||||
resetSession() { this.disconnected(); this.consumerId = undefined; }
|
||||
request(operation, uri) {
|
||||
if (!this.client || !this.consumerId)
|
||||
return Promise.reject(new Error("External source unavailable: reconnect to Studio."));
|
||||
return this.client.sendRequest(`prometeu/${operation}`, { consumerId: this.consumerId, uri });
|
||||
}
|
||||
async provideTextDocumentContent(uri, token) {
|
||||
const key = uri.toString();
|
||||
const old = this.documents.get(key);
|
||||
if (old)
|
||||
return old.text;
|
||||
const content = await this.request("readExternalSource", key);
|
||||
if (token.isCancellationRequested) {
|
||||
await this.release(key);
|
||||
throw new Error("External source read cancelled.");
|
||||
}
|
||||
if (!content.descriptor.readOnly || content.descriptor.uri !== key)
|
||||
throw new Error("Invalid external source descriptor.");
|
||||
this.documents.set(key, content);
|
||||
this.available.add(key);
|
||||
this.refreshStatus();
|
||||
return content.text;
|
||||
}
|
||||
async opened(document) {
|
||||
if (document.uri.scheme !== exports.externalScheme)
|
||||
return;
|
||||
const content = this.documents.get(document.uri.toString());
|
||||
if (content && content.descriptor.languageId !== document.languageId)
|
||||
await vscode.languages.setTextDocumentLanguage(document, content.descriptor.languageId);
|
||||
}
|
||||
async closeDocument(document) {
|
||||
const uri = document.uri.toString();
|
||||
if (!this.documents.has(uri))
|
||||
return;
|
||||
// Changing language also fires close/open; retain while VS Code still owns the document.
|
||||
await new Promise(resolve => setTimeout(resolve, 0));
|
||||
if (vscode.workspace.textDocuments.some(open => open.uri.toString() === uri && !open.isClosed))
|
||||
return;
|
||||
this.documents.delete(uri);
|
||||
this.available.delete(uri);
|
||||
if (this.client)
|
||||
await this.release(uri);
|
||||
else
|
||||
this.closed.add(uri);
|
||||
}
|
||||
async release(uri) {
|
||||
if (this.client && this.consumerId)
|
||||
await this.client.sendRequest("prometeu/releaseExternalSource", { consumerId: this.consumerId, uri });
|
||||
}
|
||||
async shutdown() {
|
||||
if (this.client && this.consumerId)
|
||||
await this.client.sendRequest("prometeu/releaseExternalSource", { consumerId: this.consumerId, uri: null });
|
||||
this.resetSession();
|
||||
this.documents.clear();
|
||||
}
|
||||
dispose() { this.disconnected(); this.documents.clear(); this.status.dispose(); }
|
||||
}
|
||||
exports.ExternalSources = ExternalSources;
|
||||
//# sourceMappingURL=externalSources.js.map
|
||||
Reference in New Issue
Block a user