Rename syntaxtree text provider to SyntaxTreeContentProvider

This commit is contained in:
Ville Penttinen 2019-03-03 21:54:51 +02:00
parent c2d3203d0c
commit 1b4e0ec1c8
3 changed files with 11 additions and 13 deletions

View file

@ -5,7 +5,7 @@ import { Server } from '../server';
export const syntaxTreeUri = vscode.Uri.parse('rust-analyzer://syntaxtree');
export class TextDocumentContentProvider
export class SyntaxTreeContentProvider
implements vscode.TextDocumentContentProvider {
public eventEmitter = new vscode.EventEmitter<vscode.Uri>();
public syntaxTree: string = 'Not available';
@ -54,7 +54,7 @@ type SyntaxTreeResult = string;
// Opens the virtual file that will show the syntax tree
//
// The contents of the file come from the `TextDocumentContentProvider`
export function createHandle(provider: TextDocumentContentProvider) {
export function createHandle(provider: SyntaxTreeContentProvider) {
return async () => {
const editor = vscode.window.activeTextEditor;
const rangeEnabled = !!(editor && !editor.selection.isEmpty);

View file

@ -1,20 +1,18 @@
import * as vscode from 'vscode';
import {
syntaxTreeUri,
TextDocumentContentProvider
SyntaxTreeContentProvider,
syntaxTreeUri
} from '../commands/syntaxTree';
export function createHandler(
textDocumentContentProvider: TextDocumentContentProvider
) {
export function createHandler(syntaxTreeProvider: SyntaxTreeContentProvider) {
return (event: vscode.TextDocumentChangeEvent) => {
const doc = event.document;
if (doc.languageId !== 'rust') {
return;
}
afterLs(() => {
textDocumentContentProvider.eventEmitter.fire(syntaxTreeUri);
syntaxTreeProvider.eventEmitter.fire(syntaxTreeUri);
});
};
}

View file

@ -2,7 +2,7 @@ import * as vscode from 'vscode';
import * as lc from 'vscode-languageclient';
import * as commands from './commands';
import { TextDocumentContentProvider } from './commands/syntaxTree';
import { SyntaxTreeContentProvider } from './commands/syntaxTree';
import * as events from './events';
import * as notifications from './notifications';
import { Server } from './server';
@ -100,21 +100,21 @@ export function activate(context: vscode.ExtensionContext) {
events.changeActiveTextEditor.handle
);
const textDocumentContentProvider = new TextDocumentContentProvider();
const syntaxTreeContentProvider = new SyntaxTreeContentProvider();
disposeOnDeactivation(
vscode.workspace.registerTextDocumentContentProvider(
'rust-analyzer',
textDocumentContentProvider
syntaxTreeContentProvider
)
);
registerCommand(
'rust-analyzer.syntaxTree',
commands.syntaxTree.createHandle(textDocumentContentProvider)
commands.syntaxTree.createHandle(syntaxTreeContentProvider)
);
vscode.workspace.onDidChangeTextDocument(
events.changeTextDocument.createHandler(textDocumentContentProvider),
events.changeTextDocument.createHandler(syntaxTreeContentProvider),
null,
context.subscriptions
);