Revert "style: format files"

This reverts commit 5e9a7f9215.
This commit is contained in:
Shunsuke Shibayama 2024-06-26 17:11:18 +09:00
parent 5e9a7f9215
commit 0717723ca7
2 changed files with 13 additions and 42 deletions

View File

@ -1,10 +1,6 @@
import { Uri, commands } from "vscode"; import { Uri, commands } from "vscode";
// copied and modified from https://github.com/rust-lang/rust-analyzer/blob/27239fbb58a115915ffc1ce65ededc951eb00fd2/editors/code/src/commands.ts // copied and modified from https://github.com/rust-lang/rust-analyzer/blob/27239fbb58a115915ffc1ce65ededc951eb00fd2/editors/code/src/commands.ts
import type { import type { LanguageClient, Location, Position } from "vscode-languageclient/node";
LanguageClient,
Location,
Position,
} from "vscode-languageclient/node";
export async function showReferences( export async function showReferences(
client: LanguageClient | undefined, client: LanguageClient | undefined,

View File

@ -1,9 +1,5 @@
import { type ExtensionContext, commands, window, workspace } from "vscode"; import { type ExtensionContext, commands, window, workspace } from "vscode";
import { import { LanguageClient, type LanguageClientOptions, type ServerOptions } from "vscode-languageclient/node";
LanguageClient,
type LanguageClientOptions,
type ServerOptions,
} from "vscode-languageclient/node";
import { showReferences } from "./commands"; import { showReferences } from "./commands";
let client: LanguageClient | undefined; let client: LanguageClient | undefined;
@ -11,30 +7,16 @@ let client: LanguageClient | undefined;
async function startLanguageClient(context: ExtensionContext) { async function startLanguageClient(context: ExtensionContext) {
try { try {
const executablePath = (() => { const executablePath = (() => {
const executablePath = workspace const executablePath = workspace.getConfiguration("pylyzer").get<string>("executablePath", "");
.getConfiguration("pylyzer")
.get<string>("executablePath", "");
return executablePath === "" ? "pylyzer" : executablePath; return executablePath === "" ? "pylyzer" : executablePath;
})(); })();
const enableDiagnostics = workspace const enableDiagnostics = workspace.getConfiguration("pylyzer").get<boolean>("diagnostics", true);
.getConfiguration("pylyzer") const enableInlayHints = workspace.getConfiguration("pylyzer").get<boolean>("inlayHints", false);
.get<boolean>("diagnostics", true); const enableSemanticTokens = workspace.getConfiguration("pylyzer").get<boolean>("semanticTokens", true);
const enableInlayHints = workspace const enableHover = workspace.getConfiguration("pylyzer").get<boolean>("hover", true);
.getConfiguration("pylyzer") const smartCompletion = workspace.getConfiguration("pylyzer").get<boolean>("smartCompletion", true);
.get<boolean>("inlayHints", false);
const enableSemanticTokens = workspace
.getConfiguration("pylyzer")
.get<boolean>("semanticTokens", true);
const enableHover = workspace
.getConfiguration("pylyzer")
.get<boolean>("hover", true);
const smartCompletion = workspace
.getConfiguration("pylyzer")
.get<boolean>("smartCompletion", true);
/* optional features */ /* optional features */
const checkOnType = workspace const checkOnType = workspace.getConfiguration("pylyzer").get<boolean>("checkOnType", false);
.getConfiguration("pylyzer")
.get<boolean>("checkOnType", false);
const args = ["--server"]; const args = ["--server"];
args.push("--"); args.push("--");
if (!enableDiagnostics) { if (!enableDiagnostics) {
@ -96,18 +78,11 @@ async function restartLanguageClient() {
} }
export async function activate(context: ExtensionContext) { export async function activate(context: ExtensionContext) {
context.subscriptions.push(commands.registerCommand("pylyzer.restartLanguageServer", () => restartLanguageClient()));
context.subscriptions.push( context.subscriptions.push(
commands.registerCommand("pylyzer.restartLanguageServer", () => commands.registerCommand("pylyzer.showReferences", async (uri, position, locations) => {
restartLanguageClient(), await showReferences(client, uri, position, locations);
), }),
);
context.subscriptions.push(
commands.registerCommand(
"pylyzer.showReferences",
async (uri, position, locations) => {
await showReferences(client, uri, position, locations);
},
),
); );
await startLanguageClient(context); await startLanguageClient(context);
} }