Skip to content

Provide client-side snippet until language server is ready #2240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 25, 2022
Merged
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
5 changes: 2 additions & 3 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { registerClientProviders } from './providerDispatcher';
import * as fileEventHandler from './fileEventHandler';
import { StandardLanguageClient } from './standardLanguageClient';
import { apiManager } from './apiManager';
import { SnippetCompletionProvider } from './snippetCompletionProvider';
import { snippetCompletionProvider } from './snippetCompletionProvider';
import { runtimeStatusBarProvider } from './runtimeStatusBarProvider';
import { serverStatusBarProvider } from './serverStatusBarProvider';
import { markdownPreviewProvider } from "./markdownPreviewProvider";
Expand Down Expand Up @@ -408,8 +408,7 @@ export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
}
});

const snippetProvider: SnippetCompletionProvider = new SnippetCompletionProvider();
context.subscriptions.push(languages.registerCompletionItemProvider({ scheme: 'file', language: 'java' }, snippetProvider));
context.subscriptions.push(snippetCompletionProvider.initialize());
context.subscriptions.push(serverStatusBarProvider);
context.subscriptions.push(runtimeStatusBarProvider);

Expand Down
27 changes: 20 additions & 7 deletions src/snippetCompletionProvider.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
'use strict';

import { CompletionItemProvider, TextDocument, Position, CancellationToken, CompletionContext, CompletionItem, CompletionItemKind, SnippetString, MarkdownString } from "vscode";
import { CompletionItemProvider, TextDocument, Position, CancellationToken, CompletionContext, CompletionItem, CompletionItemKind, SnippetString, MarkdownString, languages, Disposable } from "vscode";
import * as fse from 'fs-extra';
import * as path from 'path';
import { apiManager } from "./apiManager";
import { ClientStatus } from "./extension.api";

export class SnippetCompletionProvider implements CompletionItemProvider {
class SnippetCompletionProvider implements Disposable {

private providerImpl: Disposable;

public initialize(): SnippetCompletionProvider {
this.providerImpl = languages.registerCompletionItemProvider({ scheme: 'file', language: 'java' }, new SnippetCompletionProviderImpl());
return this;
}

public dispose(): void {
if (this.providerImpl) {
this.providerImpl.dispose();
}
}
}

class SnippetCompletionProviderImpl implements CompletionItemProvider {

private snippets: {};

Expand All @@ -15,9 +29,6 @@ export class SnippetCompletionProvider implements CompletionItemProvider {
}

public async provideCompletionItems(_document: TextDocument, _position: Position, _token: CancellationToken, _context: CompletionContext): Promise<CompletionItem[]> {
if (apiManager.getApiInstance().status === ClientStatus.Started) {
return [];
}

const snippetItems: CompletionItem[] = [];
for (const label of Object.keys(this.snippets)) {
Expand Down Expand Up @@ -48,3 +59,5 @@ export function beautifyDocument(raw: string): MarkdownString {
const escapedString = raw.replace(/\$\{\d:?(.*?)\}/gm, '$1').replace(/\$\d/gm, '');
return new MarkdownString().appendCodeblock(escapedString, "java");
}

export const snippetCompletionProvider: SnippetCompletionProvider = new SnippetCompletionProvider();
3 changes: 3 additions & 0 deletions src/standardLanguageClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import { TypeHierarchyDirection, TypeHierarchyItem } from "./typeHierarchy/proto
import { buildFilePatterns } from './plugin';
import { pomCodeActionMetadata, PomCodeActionProvider } from "./pom/pomCodeActionProvider";
import { findRuntimes, IJavaRuntime } from "jdk-utils";
import { snippetCompletionProvider } from "./snippetCompletionProvider";

const extensionName = 'Language Support for Java';
const GRADLE_CHECKSUM = "gradle/checksum/prompt";
Expand Down Expand Up @@ -110,6 +111,8 @@ export class StandardLanguageClient {
if (!hasImported) {
showImportFinishNotification(context);
}
// Disable the client-side snippet provider since LS is ready.
snippetCompletionProvider.dispose();
break;
case 'Started':
this.status = ClientStatus.Started;
Expand Down
3 changes: 3 additions & 0 deletions src/syntaxLanguageClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { ServerMode } from "./settings";
import { StatusNotification } from "./protocol";
import { apiManager } from "./apiManager";
import { ExtensionAPI, ClientStatus } from "./extension.api";
import { snippetCompletionProvider } from "./snippetCompletionProvider";

const extensionName = "Language Support for Java (Syntax Server)";

Expand Down Expand Up @@ -61,6 +62,8 @@ export class SyntaxLanguageClient {
case 'Started':
this.status = ClientStatus.Started;
apiManager.updateStatus(ClientStatus.Started);
// Disable the client-side snippet provider since LS is ready.
snippetCompletionProvider.dispose();
break;
case 'Error':
this.status = ClientStatus.Error;
Expand Down