Skip to content

Commit

Permalink
Add support for textDocument/linkedEditingRange
Browse files Browse the repository at this point in the history
  • Loading branch information
angelozerr committed Feb 19, 2021
1 parent 2dc91a7 commit 756df04
Show file tree
Hide file tree
Showing 6 changed files with 504 additions and 457 deletions.
943 changes: 495 additions & 448 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"fs-extra": "^8.1.0",
"glob": "^7.1.4",
"path-exists": "^4.0.0",
"vscode-languageclient": "^5.2.1",
"vscode-languageclient": "^7.0.0",
"yauzl": "^2.10.0"
},
"contributes": {
Expand Down
2 changes: 1 addition & 1 deletion src/binaryServerStarter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import * as os from 'os';
import * as path from 'path';
import { Readable } from 'stream';
import { commands, ExtensionContext, extensions, window, WorkspaceConfiguration } from "vscode";
import { Executable } from "vscode-languageclient";
import { Executable } from "vscode-languageclient/node";
import * as yauzl from 'yauzl';
import { addTrustedHash, getTrustedHashes } from './binaryHashManager';
import { getXMLConfiguration } from "./settings";
Expand Down
10 changes: 5 additions & 5 deletions src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import * as os from 'os';
import * as path from 'path';
import { Command, commands, ExtensionContext, extensions, IndentAction, LanguageConfiguration, languages, Position, TextDocument, TextEditor, Uri, window, workspace } from "vscode";
import { CancellationToken, ConfigurationParams, ConfigurationRequest, DidChangeConfigurationNotification, Executable, ExecuteCommandParams, ExecuteCommandRequest, LanguageClient, LanguageClientOptions, MessageType, NotificationType, ReferencesRequest, RequestType, RevealOutputChannelOn, TextDocumentIdentifier, TextDocumentPositionParams } from 'vscode-languageclient';
import { CancellationToken, ConfigurationParams, ConfigurationRequest, DidChangeConfigurationNotification, Executable, ExecuteCommandParams, ExecuteCommandRequest, LanguageClient, LanguageClientOptions, MessageType, NotificationType, ReferencesRequest, RequestType, RevealOutputChannelOn, TextDocumentIdentifier, TextDocumentPositionParams } from 'vscode-languageclient/node';
import { Commands } from './commands';
import { markdownPreviewProvider } from "./markdownPreviewProvider";
import { collectXmlJavaExtensions, onExtensionChange } from './plugin';
Expand Down Expand Up @@ -116,15 +116,15 @@ export interface XMLExtensionApi {
}

namespace ExecuteClientCommandRequest {
export const type: RequestType<ExecuteCommandParams, any, void, void> = new RequestType('xml/executeClientCommand')
export const type: RequestType<ExecuteCommandParams, any, void> = new RequestType('xml/executeClientCommand')
}

namespace TagCloseRequest {
export const type: RequestType<TextDocumentPositionParams, AutoCloseResult, any, any> = new RequestType('xml/closeTag');
export const type: RequestType<TextDocumentPositionParams, AutoCloseResult, any> = new RequestType('xml/closeTag');
}

namespace SymbolsLimitExceededNotification {
export const type: NotificationType<{ commandId: string, message: string }, any> = new NotificationType('xml/symbolsLimitExceeded');
export const type: NotificationType<{ commandId: string, message: string }> = new NotificationType('xml/symbolsLimitExceeded');
}

interface ActionableMessage {
Expand All @@ -135,7 +135,7 @@ interface ActionableMessage {
}

namespace ActionableNotification {
export const type = new NotificationType<ActionableMessage, void>('xml/actionableNotification');
export const type = new NotificationType<ActionableMessage>('xml/actionableNotification');
}

let languageClient: LanguageClient;
Expand Down
2 changes: 1 addition & 1 deletion src/javaServerStarter.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as os from 'os';
import * as path from 'path';
import { ExtensionContext, workspace } from 'vscode';
import { Executable } from 'vscode-languageclient';
import { Executable } from 'vscode-languageclient/node';
import { RequirementsData } from './requirements';
import { getJavaagentFlag, getKey, getXMLConfiguration, IS_WORKSPACE_VMARGS_XML_ALLOWED, xmlServerVmargs } from './settings';
const glob = require('glob');
Expand Down
2 changes: 1 addition & 1 deletion src/serverStarter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { commands, ConfigurationTarget, ExtensionContext, window } from "vscode";
import { Executable } from "vscode-languageclient";
import { Executable } from "vscode-languageclient/node";
import { prepareBinaryExecutable } from "./binaryServerStarter";
import { prepareJavaExecutable } from "./javaServerStarter";
import { getOpenJDKDownloadLink, RequirementsData } from "./requirements";
Expand Down

0 comments on commit 756df04

Please sign in to comment.