Skip to content

Use an output channel #327

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.

Sign up for GitHub

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
JPinkney merged 3 commits into from
Jul 24, 2020
Merged

Use an output channel #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8594ec
Use an output channel to log error message #326
apupier Jul 23, 2020
6a7f1ee
Reuse the output channel of the Language Client #326
apupier Jul 23, 2020
6e5e6d9
Merge branch 'master' into useAnOutputChannel
JPinkney Jul 24, 2020
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
10 changes: 8 additions & 2 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import * as path from 'path';

import { workspace, ExtensionContext, extensions } from 'vscode';
import { workspace, ExtensionContext, extensions, OutputChannel, window } from 'vscode';
import { LanguageClient, LanguageClientOptions, ServerOptions, TransportKind, NotificationType } from 'vscode-languageclient';
import { URI } from 'vscode-uri';
import { CUSTOM_SCHEMA_REQUEST, CUSTOM_CONTENT_REQUEST, SchemaExtensionAPI } from './schema-extension-api';
Expand All @@ -25,6 +25,8 @@ namespace DynamicCustomSchemaRequestRegistration {
export const type: NotificationType<{}, {}> = new NotificationType('yaml/registerCustomSchemaRequest');
}

let client: LanguageClient;

export function activate(context: ExtensionContext) {
// The YAML language server is implemented in node
let serverModule = context.asAbsolutePath(path.join('node_modules', 'yaml-language-server', 'out', 'server', 'src', 'server.js'));
Expand Down Expand Up @@ -57,7 +59,7 @@ export function activate(context: ExtensionContext) {
};

// Create the language client and start it
let client = new LanguageClient('yaml', 'YAML Support', serverOptions, clientOptions);
client = new LanguageClient('yaml', 'YAML Support', serverOptions, clientOptions);
let disposable = client.start();

const schemaExtensionAPI = new SchemaExtensionAPI(client);
Expand Down Expand Up @@ -131,3 +133,7 @@ function getSchemaAssociation(context: ExtensionContext): ISchemaAssociations {

return associations;
}

export function logToExtensionOutputChannel(message: string) {
client.outputChannel.appendLine(message);
}
31 changes: 18 additions & 13 deletions src/schema-extension-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { URI } from 'vscode-uri'
import { LanguageClient, RequestType } from 'vscode-languageclient';
import { workspace } from 'vscode';
import { logToExtensionOutputChannel } from './extension';

interface SchemaContributorProvider {
readonly requestSchema: (resource: string) => string;
Expand Down Expand Up @@ -92,24 +93,28 @@ class SchemaExtensionAPI implements ExtensionAPI {
public requestCustomSchema(resource: string): string[] {
const matches = [];
for (let customKey of Object.keys(this._customSchemaContributors)) {
const contributor = this._customSchemaContributors[customKey];
let uri: string;
if (contributor.label && workspace.textDocuments) {
const labelRegexp = new RegExp(contributor.label, 'g');
for (const doc of workspace.textDocuments) {
if (doc.uri.toString() === resource) {
if (labelRegexp.test(doc.getText())) {
uri = contributor.requestSchema(resource);
return [uri];
try {
const contributor = this._customSchemaContributors[customKey];
let uri: string;
if (contributor.label && workspace.textDocuments) {
const labelRegexp = new RegExp(contributor.label, 'g');
for (const doc of workspace.textDocuments) {
if (doc.uri.toString() === resource) {
if (labelRegexp.test(doc.getText())) {
uri = contributor.requestSchema(resource);
return [uri];
}
}
}
}
}

uri = contributor.requestSchema(resource);
uri = contributor.requestSchema(resource);

if (uri) {
matches.push(uri);
if (uri) {
matches.push(uri);
}
} catch (error) {
logToExtensionOutputChannel(`Error thrown while requesting schema "${error}" when calling the registered contributor "${customKey}"`);
}
}
return matches;
Expand Down
⚡