Skip to content
Open
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
2 changes: 2 additions & 0 deletions packages/language-server/src/linting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ export async function setLintWorker(
async function rawLintDocument(
document: TextDocument,
sendDiagnostics: (diagnostics: Diagnostic[]) => void,
notifySemanticAnalysisDone: (query: string) => Promise<void>,
neo4j: Neo4jSchemaPoller,
) {
const query = document.getText();
Expand Down Expand Up @@ -83,6 +84,7 @@ async function rawLintDocument(
symbolTables: result.symbolTables,
});
}
await notifySemanticAnalysisDone(query);

sendDiagnostics(positionSafeResult);
} catch (err) {
Expand Down
4 changes: 4 additions & 0 deletions packages/language-server/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ async function lintSingleDocument(document: TextDocument): Promise<void> {
diagnostics,
});
},
async (query: string) =>
await connection.sendNotification('semanticAnalysisDone', {
query: query,
}),
neo4jSchemaPoller,
);
} else {
Expand Down
3 changes: 3 additions & 0 deletions packages/vscode-extension/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# neo4j-for-vscode

## 1.14.0
- Adds Building... button to the bottom panel for when the syntax errors are still being computed.

## 1.13.0
- Adjusts linting automatically depending on the neo4j version.
- Updates grammar and semantic analysis
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"publisher": "neo4j-extensions",
"author": "Neo4j Inc.",
"license": "Apache-2.0",
"version": "1.13.0",
"version": "1.14.0",
"preview": false,
"categories": [
"Programming Languages",
Expand Down
30 changes: 30 additions & 0 deletions packages/vscode-extension/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ export const linterStatusBarItem = window.createStatusBarItem(
StatusBarAlignment.Right,
);

const buildingStatusBarItem = window.createStatusBarItem(
StatusBarAlignment.Left,
-100,
);

export async function activate(context: ExtensionContext) {
// The server is implemented in node
const runServer = context.asAbsolutePath(
Expand Down Expand Up @@ -96,6 +101,31 @@ export async function activate(context: ExtensionContext) {

context.subscriptions.push(watcher);
}

context.subscriptions.push(buildingStatusBarItem);

workspace.onDidChangeTextDocument((event) => {
if (event.document === window.activeTextEditor?.document) {
showBuildingIcon();
}
});

client.onNotification('semanticAnalysisDone', (params) => {
const query = (params as { query: string }).query;
if (query === window.activeTextEditor?.document.getText()) {
hideBuildingIcon();
}
});
}

function showBuildingIcon() {
buildingStatusBarItem.text = '$(loading~spin) Building...';
buildingStatusBarItem.tooltip = 'Build in progress';
buildingStatusBarItem.show();
}

function hideBuildingIcon() {
buildingStatusBarItem.hide();
}

export async function deactivate(): Promise<void> | undefined {
Expand Down