Skip to content

Commit 9e3ef34

Browse files
committed
feat: use --inspect-wait for prerelease deno
1 parent 8444e87 commit 9e3ef34

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

client/src/commands.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import { createRegistryStateHandler } from "./notification_handlers";
3030
import { DenoServerInfo } from "./server_info";
3131

3232
import * as dotenv from "dotenv";
33-
import * as semver from "semver";
3433
import * as vscode from "vscode";
3534
import { LanguageClient, ServerOptions } from "vscode-languageclient/node";
3635
import type { Location, Position } from "vscode-languageclient/node";
@@ -39,6 +38,7 @@ import { denoUpgradePromptAndExecute } from "./upgrade";
3938
import { join } from "path";
4039
import { readFileSync } from "fs";
4140
import * as process from "process";
41+
import { semver } from "./semver";
4242

4343
// deno-lint-ignore no-explicit-any
4444
export type Callback = (...args: any[]) => unknown;
@@ -261,9 +261,7 @@ export function startLanguageServer(
261261

262262
if (
263263
semver.valid(extensionContext.serverInfo.version) &&
264-
!semver.satisfies(extensionContext.serverInfo.version, SERVER_SEMVER, {
265-
includePrerelease: true,
266-
})
264+
!semver.satisfies(extensionContext.serverInfo.version, SERVER_SEMVER)
267265
) {
268266
notifyServerSemver(extensionContext.serverInfo.version);
269267
} else {

client/src/semver.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import * as semverPackage from "semver";
2+
import { Options, Range, SemVer } from "semver";
3+
4+
export const semver = {
5+
...semverPackage,
6+
7+
satisfies: (
8+
version: string | SemVer,
9+
range: string | Range,
10+
optionsOrLoose?: boolean | Options,
11+
): boolean => {
12+
return semverPackage.satisfies(
13+
version,
14+
range,
15+
optionsOrLoose ?? { includePrerelease: true },
16+
);
17+
},
18+
};

client/src/util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import * as fs from "fs";
66
import * as os from "os";
77
import * as path from "path";
88
import * as process from "process";
9-
import * as semver from "semver";
109
import {
1110
Location,
1211
Position,
@@ -16,6 +15,7 @@ import {
1615
WorkspaceFolder,
1716
} from "vscode";
1817
import { JSONVisitor, visit } from "jsonc-parser/lib/esm/main.js";
18+
import { semver } from "./semver";
1919

2020
/** Assert that the condition is "truthy", otherwise throw. */
2121
export function assert(cond: unknown, msg = "Assertion failed."): asserts cond {

0 commit comments

Comments
 (0)