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: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@

##### Expected Result

##### Additional Informations
##### Additional Information
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ While developing the language server and the extension, you don't need to deploy
- Start the language server via `jdt.ls.socket-stream` launch configuration in VS Code or Eclipse
![Socket Steam in VS Code](images/changelog/SocketSteamInVSCode.png)

- Start the extenion via _Launch Extension - JDTLS Client_ in VS Code
- Start the extension via _Launch Extension - JDTLS Client_ in VS Code
- You can modify `launch.json` to use a different port:
- Modify `JDTLS_CLIENT_PORT` to specify the port VS Code should connect to.

Expand Down Expand Up @@ -205,7 +205,7 @@ on ways to sideload or share.
If you encounter a problem and know it is caused by eclipse.jdt.ls, then please open a bug report over [there](https://github.com/eclipse/eclipse.jdt.ls/issues).
In doubt, you can report issues in the [vscode-java issue tracker](https://github.com/redhat-developer/vscode-java/issues).

Try to collect as much informations as you can to describe the issue and help us reproduce the problem. Head over to the [troubleshooting page](https://github.com/redhat-developer/vscode-java/wiki/Troubleshooting#enable-logging) to see how to collect useful logging informations.
Try to collect as much information as you can to describe the issue and help us reproduce the problem. Head over to the [troubleshooting page](https://github.com/redhat-developer/vscode-java/wiki/Troubleshooting#enable-logging) to see how to collect useful logging information.

### Certificate of Origin

Expand Down
4 changes: 2 additions & 2 deletions USAGE_DATA.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ vscode-java has opt-in telemetry collection, provided by [vscode-redhat-telemetr
* `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.server.launchMode`, `java.autobuild.enabled`, `java.jdt.ls.javac.enabled`
* The extension name and the choice made when a recommendation to install a 3rd party extension is proposed
* The name of Java commands being manually executed, and any resulting errors
* The number of results (eg. 20), whether an error occured (eg. false), engine type (eg. 'ecj', 'dom') 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 occured (eg. 200m)
* The number of results (eg. 20), whether an error occurred (eg. false), engine type (eg. 'ecj', 'dom') 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 (eg. 200m)

## What's included in the general telemetry data

Expand Down
2 changes: 1 addition & 1 deletion document/_java.learnMoreAboutRefactorings.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public void order(String[] books) {
Converts an anonymous class creation to the lambda expression.

### Example
Let's convert the anonymous class `Runnable(){...}` to a lamda expression.
Let's convert the anonymous class `Runnable(){...}` to a lambda expression.
#### Before

```java
Expand Down
2 changes: 1 addition & 1 deletion document/_java.metadataFilesGeneration.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

We use the setting `java.import.generatesMetadataFilesAtProjectRoot` to control where the project metadata files(.project, .classpath, .factorypath, .settings/) will be generated:
- `true`: Metadata files will be generated at the project's root.
- `false`: Metadata files will be generated at the workspace storage. To be specifc, the path will be: `<WORKSPACE_STORAGE_PATH>/redhat.java/jdt_ws/.metadata/.plugins/org.eclipse.core.resources/.projects/<PROJECT_NAME>/`.
- `false`: Metadata files will be generated at the workspace storage. To be specific, the path will be: `<WORKSPACE_STORAGE_PATH>/redhat.java/jdt_ws/.metadata/.plugins/org.eclipse.core.resources/.projects/<PROJECT_NAME>/`.

By default, the setting is set to `false`.

Expand Down
2 changes: 1 addition & 1 deletion src/apiManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class ApiManager {
private serverReadyPromiseResolve: (result: boolean) => void;

public initialize(requirements: RequirementsData, serverMode: ServerMode): void {
// if it's manual import mode, set the server mode to lightwight, so that the
// if it's manual import mode, set the server mode to lightweight, so that the
// project explorer won't spinning until import project is triggered.
if (getJavaConfiguration().get<string>("import.projectSelection") === "manual") {
serverMode = ServerMode.lightWeight;
Expand Down
2 changes: 1 addition & 1 deletion src/fileEventHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ async function handleNewJavaFiles(e: FileCreateEvent) {
}

// See https://github.com/redhat-developer/vscode-java/issues/2939
// The client side listener should avoid inserting duplicated conents
// The client side listener should avoid inserting duplicated contents
// when the file creation event is triggered from a WorkspaceEdit.
// Given that the VS Code API doesn't provide a way to distinguish
// the event source, a workaround is to wait 100ms and let WorkspaceEdit
Expand Down
6 changes: 3 additions & 3 deletions src/lombokSupport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ function lombokPath2Version(lombokPath: string): string {
}

function lombokPath2VersionNumber(lombokPath: string): string {
const lombokVersioNumber = lombokPath2Version(lombokPath).split('-')[1];
return lombokVersioNumber;
const lombokVersionNumber = lombokPath2Version(lombokPath).split('-')[1];
return lombokVersionNumber;
}

export function getLombokVersion(): string {
Expand Down Expand Up @@ -149,7 +149,7 @@ export async function checkLombokDependency(context: ExtensionContext, projectUr
}
projectLombokPath = currentLombokClasspath;
/* if projectLombokPath is undefined, it means that this project has not imported Lombok.
* We don't need initalize Lombok status bar in this case.
* We don't need initialize Lombok status bar in this case.
*/
if (!isLombokStatusBarInitialized && projectLombokPath) {
if (!isLombokCommandInitialized) {
Expand Down
2 changes: 1 addition & 1 deletion src/refactoring/changeSignaturePanel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class ChangeSignaturePanel {
private readonly panel: WebviewPanel;
private disposables: Disposable[] = [];

// method matadata
// method metadata
private methodIdentifier: string | undefined;
private methodName: string | undefined;
private modifier: string | undefined;
Expand Down
2 changes: 1 addition & 1 deletion src/serverTaskPresenter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ async function getPresenterTaskExecution(): Promise<TaskExecution> {
// Fix #1180. When switching to multiroot workspace by "Add Folder to Workspace...", vscode restarts the extension
// host without deactivating the extension. See https://github.com/microsoft/vscode/issues/69335
// This is to clean up the existing task execution and terminal created by previous extension instance because they
// are no longer accessible to the current extension instance afte the restart.
// are no longer accessible to the current extension instance after the restart.
// TODO - As mentioned in https://github.com/microsoft/vscode/issues/69335, vscode will no long restart because of
// workspace changes. We can revisit this issue to see if we can remove the fix.
async function killExistingExecutions() {
Expand Down