Skip to content
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

Set the deprecated tag to compiler.warn.has.been.deprecated #302

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Set the deprecated tag to compiler.warn.has.been.deprecated #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7db687
Update dependencies
nya3jp Dec 29, 2024
5eab174
Set the deprecated tag to compiler.warn.has.been.deprecated
nya3jp Dec 29, 2024
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
55 changes: 28 additions & 27 deletions lib/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import * as Path from "path";
import * as FS from "fs";
import {window, workspace, ExtensionContext, commands, tasks, Task, TaskExecution, ShellExecution, Uri, TaskDefinition, languages, IndentAction, Progress, ProgressLocation, debug, DebugConfiguration, Range, Position, TextDocument, TextDocumentContentProvider, CancellationToken, ProviderResult, ConfigurationChangeEvent} from 'vscode';
import {LanguageClient, LanguageClientOptions, ServerOptions, NotificationType} from "vscode-languageclient";
import {LanguageClient, LanguageClientOptions, ServerOptions, NotificationType} from "vscode-languageclient/node";
import {loadStyles, decoration} from './textMate';
import * as AdmZip from 'adm-zip';

Expand All @@ -17,7 +17,7 @@ export async function activate(context: ExtensionContext) {

// Teach VSCode to open JAR files
workspace.registerTextDocumentContentProvider('jar', new JarFileSystemProvider());

// Options to control the language client
let clientOptions: LanguageClientOptions = {
// Register the server for java documents
Expand All @@ -42,7 +42,7 @@ export async function activate(context: ExtensionContext) {
let launcherRelativePath = platformSpecificLangServer();
let launcherPath = [context.extensionPath].concat(launcherRelativePath);
let launcher = Path.resolve(...launcherPath);

// Start the child java process
let serverOptions: ServerOptions = {
command: launcher,
Expand All @@ -58,19 +58,20 @@ export async function activate(context: ExtensionContext) {

// Create the language client and start the client.
let client = new LanguageClient('java', 'Java Language Server', serverOptions, clientOptions);
let disposable = client.start();

// Push the disposable to the context's subscriptions so that the
// Push the client to the context's subscriptions so that the
// client can be deactivated on extension deactivation
context.subscriptions.push(disposable);
context.subscriptions.push(client);

await client.start();

// Register test commands
commands.registerCommand('java.command.test.run', runTest);
commands.registerCommand('java.command.test.debug', debugTest);
commands.registerCommand('java.command.findReferences', runFindReferences);

// When the language client activates, register a progress-listener
client.onReady().then(() => createProgressListeners(client));
// Register a progress-listener
createProgressListeners(client);

// Apply semantic colors using custom notification
function asRange(r: RangeLike) {
Expand Down Expand Up @@ -119,12 +120,12 @@ export async function activate(context: ExtensionContext) {
applySemanticColors()
}
}
client.onReady().then(() => {
client.onNotification(new NotificationType('java/colors'), cacheSemanticColors);
context.subscriptions.push(window.onDidChangeVisibleTextEditors(applySemanticColors));
context.subscriptions.push(workspace.onDidCloseTextDocument(forgetSemanticColors));
context.subscriptions.push(workspace.onDidChangeConfiguration(onChangeConfiguration))
});

client.onNotification(new NotificationType('java/colors'), cacheSemanticColors);
context.subscriptions.push(window.onDidChangeVisibleTextEditors(applySemanticColors));
context.subscriptions.push(workspace.onDidCloseTextDocument(forgetSemanticColors));
context.subscriptions.push(workspace.onDidChangeConfiguration(onChangeConfiguration))

await loadStyles();
applySemanticColors();
}
Expand Down Expand Up @@ -259,7 +260,7 @@ function templateCommand(command: string[], file: string, className: string, met
}

interface ProgressMessage {
message: string
message: string
increment: number
}

Expand All @@ -268,7 +269,7 @@ function createProgressListeners(client: LanguageClient) {
let progressListener = new class {
progress: Progress<{message: string, increment?: number}>
resolve: (nothing: {}) => void

startProgress(message: string) {
if (this.progress != null)
this.endProgress();
Expand All @@ -278,11 +279,11 @@ function createProgressListeners(client: LanguageClient) {
this.resolve = resolve;
}));
}

reportProgress(message: string, increment: number) {
if (increment == -1)
this.progress.report({message});
else
else
this.progress.report({message, increment})
}

Expand Down Expand Up @@ -340,10 +341,10 @@ function platformSpecificLangServer(): string[] {
// Alternative server options if you want to use visualvm
function visualVmConfig(context: ExtensionContext): ServerOptions {
let javaExecutablePath = findJavaExecutable('java');

if (javaExecutablePath == null) {
window.showErrorMessage("Couldn't locate java in $JAVA_HOME or $PATH");

throw "Gave up";
}
const jars = [
Expand All @@ -353,7 +354,7 @@ function visualVmConfig(context: ExtensionContext): ServerOptions {
];
const classpath = jars.map(jar => Path.resolve(context.extensionPath, "dist", "classpath", jar)).join(':');
let args = [
'-cp', classpath,
'-cp', classpath,
'-Xverify:none', // helps VisualVM avoid 'error 62'
'-Xdebug',
// '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005',
Expand All @@ -369,9 +370,9 @@ function visualVmConfig(context: ExtensionContext): ServerOptions {
// Opens, needed at runtime for reflection
"--add-opens", "jdk.compiler/com.sun.tools.javac.api=javacs",
];

console.log(javaExecutablePath + ' ' + args.join(' '));

// Start the child java process
return {
command: javaExecutablePath,
Expand Down Expand Up @@ -410,7 +411,7 @@ function findJavaExecutable(binname: string) {
// Then search PATH parts
if (process.env['PATH']) {
console.log('Looking for java in PATH');

let pathparts = process.env['PATH'].split(Path.delimiter);
for (let i = 0; i < pathparts.length; i++) {
let binpath = Path.join(pathparts[i], binname);
Expand All @@ -419,8 +420,8 @@ function findJavaExecutable(binname: string) {
}
}
}
// Else return the binary name directly (this will likely always fail downstream)

// Else return the binary name directly (this will likely always fail downstream)
return null;
}

Expand All @@ -437,7 +438,7 @@ function findJavaExecutableInJavaHome(javaHome: string, binname: string) {
for (let i = 0; i < workspaces.length; i++) {
let binpath = Path.join(workspaces[i], 'bin', binname);

if (FS.existsSync(binpath))
if (FS.existsSync(binpath))
return binpath;
}

Expand Down
Loading