Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,6 @@ The following settings are supported:
- Find Reference
- Call Hierarchy
- Workspace Symbols
* `java.jdt.ls.javac.enabled`: [Experimental] Specify whether to enable Javac-based compilation in the language server. Requires running this extension with Java 24. Defaults to `off`.
* `java.completion.engine`: [Experimental] Select code completion engine. Defaults to `ecj`.
* `java.references.includeDeclarations`: Include declarations when finding references. Defaults to `true`
* `java.jdt.ls.appcds.enabled`: [Experimental] Enable Java AppCDS (Application Class Data Sharing) for improvements to extension activation. When set to `auto`, AppCDS will be enabled in Visual Studio Code - Insiders, and for pre-release versions.
* `java.hover.javadoc.enabled`: Enable/disable displaying Javadoc on hover. Defaults to `true`.
Expand Down
4 changes: 2 additions & 2 deletions USAGE_DATA.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ vscode-java has opt-in telemetry collection, provided by [vscode-redhat-telemetr
* Errors relating to running the language server, such as the message & stacktrace
* Whether there is a mismatch between the project's requested source level, and the JDK used for the project (e.g. true)
* Information about the following settings. In the case of settings that store a well defined value (e.g. path, url or string), we simply collect whether the setting has been set.
* `java.settings.url`, `java.format.settings.url`, `java.quickfix.showAt`, `java.symbols.includeSourceMethodDeclarations`, `java.completion.collapseCompletionItems`, `java.completion.guessMethodArguments`, `java.completion.postfix.enabled`, `java.cleanup.actionsOnSave`, `java.sharedIndexes.enabled`, `java.inlayHints.parameterNames.enabled`, `java.inlayHints.parameterNames.suppressWhenSameNameNumbered`, `java.inlayHints.variableTypes.enabled`, `java.inlayHints.parameterTypes.enabled`, `java.server.launchMode`, `java.autobuild.enabled`, `java.jdt.ls.javac.enabled`
* `java.settings.url`, `java.format.settings.url`, `java.quickfix.showAt`, `java.symbols.includeSourceMethodDeclarations`, `java.completion.collapseCompletionItems`, `java.completion.guessMethodArguments`, `java.completion.postfix.enabled`, `java.cleanup.actionsOnSave`, `java.sharedIndexes.enabled`, `java.inlayHints.parameterNames.enabled`, `java.inlayHints.parameterNames.suppressWhenSameNameNumbered`, `java.inlayHints.variableTypes.enabled`, `java.inlayHints.parameterTypes.enabled`, `java.server.launchMode`, `java.autobuild.enabled`
* The extension name and the choice made when a recommendation to install a third-party extension is proposed
* The name of Java commands being manually executed, and any resulting errors
* The number of results (e.g. 20), whether an error occurred (e.g. false), engine type (e.g. 'ecj', 'dom') and duration (in milliseconds) when code assist is activated
* The number of results (e.g. 20), whether an error occurred (e.g. false), and duration (in milliseconds) when code assist is activated
* Whether the language server ran out of memory and the maximum allocated memory at which that occurred (e.g. 200m)

## What's included in the general telemetry data
Expand Down
26 changes: 0 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -452,17 +452,6 @@
"scope": "window",
"order": 90
},
"java.jdt.ls.javac.enabled": {
"type": "string",
"enum": [
"on",
"off"
],
"default": "off",
"markdownDescription": "[Experimental] Specify whether to enable Javac-based compilation in the language server. Requires running this extension with Java 25",
"scope": "window",
"order": 95
},
"java.jdt.ls.appcds.enabled": {
"type": "string",
"enum": [
Expand Down Expand Up @@ -1094,21 +1083,6 @@
"scope": "window",
"order": 10
},
"java.completion.engine": {
"type": "string",
"default": "ecj",
"description": "[Experimental] Select code completion engine",
"scope": "window",
"enum": [
"ecj",
"dom"
],
"markdownEnumDescriptions": [
"Use ECJ-based code completion engine (default)",
"Use (highly experimental) JDT DOM-based code completion engine (requires `java.jdt.ls.javac.enabled` to be `on`)"
],
"order": 1000
},
"java.completion.postfix.enabled": {
"type": "boolean",
"default": true,
Expand Down
1 change: 0 additions & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,6 @@ export function registerCodeCompletionTelemetryListener() {
resultLength: traceEvent.resultLength || 0,
error: !!traceEvent.error,
fromSyntaxServer: !!traceEvent.fromSyntaxServer,
engine: getJavaConfiguration().get('completion.engine'),
};
return Telemetry.sendTelemetry(Telemetry.COMPLETION_EVENT, props);
}
Expand Down
55 changes: 0 additions & 55 deletions src/javaServerStarter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,61 +172,6 @@ function prepareParams(requirements: RequirementsData, workspacePath, context: E
'java.base/sun.nio.fs=ALL-UNNAMED'
);

const javacEnabled = 'on' === getJavaConfiguration().get('jdt.ls.javac.enabled');
if (javacEnabled) {
// Javac flags
params.push(
'--add-opens',
'jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED',
'--add-opens',
'jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED',
'--add-opens',
'jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED',
'--add-opens',
'jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED',
'--add-opens',
'jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED',
'--add-opens',
'jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED',
'--add-opens',
'jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED',
'--add-opens',
'jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
'--add-opens',
'jdk.javadoc/jdk.javadoc.internal.doclets.formats.html.taglets.snippet=ALL-UNNAMED',
'--add-opens',
'jdk.javadoc/jdk.javadoc.internal.doclets.formats.html.taglets=ALL-UNNAMED',
'--add-opens',
'jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED',
'--add-opens',
'jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED',
'--add-opens',
'jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED',
'--add-opens',
'jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED',
'--add-opens',
'jdk.compiler/com.sun.tools.javac.resources=ALL-UNNAMED',
'--add-opens',
'java.base/sun.nio.ch=ALL-UNNAMED',
'--add-opens',
'jdk.zipfs/jdk.nio.zipfs=ALL-UNNAMED',
'--add-opens',
'java.compiler/javax.tools=ALL-UNNAMED',
'--add-opens',
'java.base/java.nio.channels=ALL-UNNAMED',
'-DICompilationUnitResolver=org.eclipse.jdt.core.dom.JavacCompilationUnitResolver',
'-DAbstractImageBuilder.compilerFactory=org.eclipse.jdt.internal.javac.JavacCompilerFactory',
'-DCompilationUnit.DOM_BASED_OPERATIONS=true',
'-DSourceIndexer.DOM_BASED_INDEXER=true',
'-DMatchLocator.DOM_BASED_MATCH=true',
'-DIJavaSearchDelegate=org.eclipse.jdt.internal.core.search.DOMJavaSearchDelegate',
);

if('dom' === getJavaConfiguration().get('completion.engine')){
params.push('-DCompilationUnit.codeComplete.DOM_BASED_OPERATIONS=true');
};
}

params.push('-Declipse.application=org.eclipse.jdt.ls.core.id1',
'-Dosgi.bundles.defaultStartLevel=4',
'-Declipse.product=org.eclipse.jdt.ls.core.product');
Expand Down
2 changes: 0 additions & 2 deletions src/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ function hasJavaConfigChanged(oldConfig: WorkspaceConfiguration, newConfig: Work
|| hasConfigKeyChanged('sharedIndexes.location', oldConfig, newConfig)
|| hasConfigKeyChanged('transport', oldConfig, newConfig)
|| hasConfigKeyChanged('diagnostic.filter', oldConfig, newConfig)
|| hasConfigKeyChanged('jdt.ls.javac.enabled', oldConfig, newConfig)
|| hasConfigKeyChanged('completion.engine', oldConfig, newConfig)
|| hasConfigKeyChanged('jdt.ls.appcds.enabled', oldConfig, newConfig);
}

Expand Down
13 changes: 0 additions & 13 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -251,19 +251,6 @@ export async function getJavaConfig(javaHome: string, skipAutoDetection?: boolea
break;
}

const javacSupport = javaConfig.jdt.ls.javac.enabled;
switch (javacSupport) {
case "on":
javaConfig.jdt.ls.javac.enabled = true;
break;
case "off":
javaConfig.jdt.ls.javac.enabled = false;
break;
default:
javaConfig.jdt.ls.javac.enabled = false;
break;
}

if (javaConfig.completion.matchCase === "auto") {
javaConfig.completion.matchCase = "firstLetter";
}
Expand Down
Loading