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
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ The following settings are supported:
* `java.eclipse.downloadSources`: Enable/disable download of Maven source artifacts for Eclipse projects.
* `java.references.includeDecompiledSources`: Include the decompiled sources when finding references. Defaults to true.
* `java.project.sourcePaths`: Relative paths to the workspace where stores the source files. `Only` effective in the `WORKSPACE` scope. The setting will `NOT` affect Maven or Gradle project.
* `java.typeHierarchy.lazyLoad`: Enable/disable lazy loading the content in type hierarchy. Lazy loading could save a lot of loading time but every type should be expanded manually to load its content.
* `java.codeGeneration.insertionLocation`: Specifies the insertion location of the code generated by source actions. Defaults to `afterCursor`.
- `afterCursor`: Insert the generated code after the member where the cursor is located.
- `beforeCursor`: Insert the generated code before the member where the cursor is located.
Expand Down
87 changes: 0 additions & 87 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1604,13 +1604,6 @@
"scope": "window",
"order": 65
},
"java.typeHierarchy.lazyLoad": {
"type": "boolean",
"default": false,
"description": "Enable/disable lazy loading the content in type hierarchy. Lazy loading could save a lot of loading time but every type should be expanded manually to load its content.",
"scope": "window",
"order": 70
},
"java.inlayHints.parameterNames.enabled": {
"type": "string",
"enum": [
Expand Down Expand Up @@ -1839,37 +1832,6 @@
"title": "%java.action.navigateToSuperImplementation%",
"category": "Java"
},
{
"command": "java.action.showTypeHierarchy",
"title": "%java.action.showTypeHierarchy%",
"category": "Java"
},
{
"command": "java.action.showClassHierarchy",
"title": "%java.action.showClassHierarchy%",
"icon": "$(type-hierarchy)",
"enablement": "typeHierarchyDirection != both && typeHierarchySymbolKind != 10",
"category": "Java"
},
{
"command": "java.action.showSupertypeHierarchy",
"title": "%java.action.showSupertypeHierarchy%",
"icon": "$(type-hierarchy-super)",
"enablement": "typeHierarchyDirection != parents",
"category": "Java"
},
{
"command": "java.action.showSubtypeHierarchy",
"title": "%java.action.showSubtypeHierarchy%",
"icon": "$(type-hierarchy-sub)",
"enablement": "typeHierarchyDirection != children",
"category": "Java"
},
{
"command": "java.action.changeBaseType",
"title": "%java.action.changeBaseType%",
"category": "Java"
},
{
"command": "java.project.createModuleInfo.command",
"title": "%java.project.createModuleInfo.command%",
Expand Down Expand Up @@ -2019,11 +1981,6 @@
"when": "javaLSReady && editorTextFocus && editorLangId == java",
"group": "navigation@90"
},
{
"command": "java.action.showTypeHierarchy",
"when": "javaLSReady && editorTextFocus && editorLangId == java",
"group": "0_navigation@3"
},
{
"command": "java.action.copyFullyQualifiedName",
"when": "javaLSReady && editorTextFocus && editorLangId == java",
Expand Down Expand Up @@ -2063,26 +2020,6 @@
"command": "java.project.listSourcePaths.command",
"when": "javaLSReady"
},
{
"command": "java.action.showTypeHierarchy",
"when": "javaLSReady && editorIsOpen"
},
{
"command": "java.action.showClassHierarchy",
"when": "false"
},
{
"command": "java.action.showSubtypeHierarchy",
"when": "false"
},
{
"command": "java.action.showSupertypeHierarchy",
"when": "false"
},
{
"command": "java.action.changeBaseType",
"when": "false"
},
{
"command": "java.project.updateSourceAttachment.command",
"when": "false"
Expand Down Expand Up @@ -2123,30 +2060,6 @@
"command": "java.dashboard.dumpState",
"when": "false"
}
],
"view/title": [
{
"command": "java.action.showClassHierarchy",
"group": "navigation@-1",
"when": "view == references-view.tree && reference-list.hasResult && reference-list.source == javaTypeHierarchy && typeHierarchySymbolKind != 10"
},
{
"command": "java.action.showSupertypeHierarchy",
"group": "navigation@0",
"when": "view == references-view.tree && reference-list.hasResult && reference-list.source == javaTypeHierarchy"
},
{
"command": "java.action.showSubtypeHierarchy",
"group": "navigation@1",
"when": "view == references-view.tree && reference-list.hasResult && reference-list.source == javaTypeHierarchy"
}
],
"view/item/context": [
{
"command": "java.action.changeBaseType",
"group": "1",
"when": "view == references-view.tree && reference-list.hasResult && reference-list.source == javaTypeHierarchy && viewItem != 'false'"
}
]
}
},
Expand Down
5 changes: 0 additions & 5 deletions package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
"java.project.listSourcePaths": "List All Java Source Paths",
"java.show.server.task.status": "Show Build Job Status",
"java.action.navigateToSuperImplementation": "Go to Super Implementation",
"java.action.showTypeHierarchy": "Show Type Hierarchy",
"java.action.showClassHierarchy": "Show Class Hierarchy",
"java.action.showSupertypeHierarchy": "Show Supertype Hierarchy",
"java.action.showSubtypeHierarchy": "Show Subtype Hierarchy",
"java.action.changeBaseType": "Base on this Type",
"java.project.createModuleInfo.command": "Create module-info.java",
"java.clean.sharedIndexes": "Clean Shared Indexes",
"java.server.restart": "Restart Java Language Server",
Expand Down
5 changes: 0 additions & 5 deletions package.nls.ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
"java.project.listSourcePaths": "모든 Java 소스 경로 표시",
"java.show.server.task.status": "빌드 작업 상태 표시",
"java.action.navigateToSuperImplementation": "상위 구현으로 이동",
"java.action.showTypeHierarchy": "Type 계층 구조 표시",
"java.action.showClassHierarchy": "Class 계층 구조 표시",
"java.action.showSupertypeHierarchy": "Supertype 계층 구조 표시",
"java.action.showSubtypeHierarchy": "Subtype 계층 구조 표시",
"java.action.changeBaseType": "이 타입을 기준으로",
"java.project.createModuleInfo.command": "module-info.java 생성",
"java.clean.sharedIndexes": "공유 인덱스 정리",
"java.server.restart": "Java Language Server 다시 시작",
Expand Down
5 changes: 0 additions & 5 deletions package.nls.zh-cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
"java.project.listSourcePaths": "列出所有 Java 源代码路径",
"java.show.server.task.status": "显示工作状态",
"java.action.navigateToSuperImplementation": "转到父类实现",
"java.action.showTypeHierarchy": "显示类型层次结构",
"java.action.showClassHierarchy": "显示类的继承关系",
"java.action.showSupertypeHierarchy": "显示父类层次结构",
"java.action.showSubtypeHierarchy": "显示子类层次结构",
"java.action.changeBaseType": "基于此类型",
"java.project.createModuleInfo.command": "创建 module-info.java",
"java.clean.sharedIndexes": "清理共享的索引文件",
"java.action.filesExplorerPasteAction": "将剪贴板文本粘贴到文件中",
Expand Down
5 changes: 0 additions & 5 deletions package.nls.zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
"java.project.listSourcePaths": "列出所有 Java 始碼路徑",
"java.show.server.task.status": "顯示建置工作狀態",
"java.action.navigateToSuperImplementation": "移到父類別中的實作",
"java.action.showTypeHierarchy": "顯示型別階層結構",
"java.action.showClassHierarchy": "顯示類別階層結構",
"java.action.showSupertypeHierarchy": "顯示父類別階層結構",
"java.action.showSubtypeHierarchy": "顯示子類別階層結構",
"java.action.changeBaseType": "以此型別為基礎",
"java.project.createModuleInfo.command": "創建 module-info.java",
"java.action.filesExplorerPasteAction": "將剪貼簿文字貼到文件中",
"java.action.doCleanup": "執行清理操作"
Expand Down
28 changes: 0 additions & 28 deletions src/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -228,34 +228,6 @@ export namespace Commands {
* Navigate To Super Method Command.
*/
export const NAVIGATE_TO_SUPER_IMPLEMENTATION_COMMAND = 'java.action.navigateToSuperImplementation';
/**
* Open Type Hierarchy of given Selection.
*/
export const SHOW_TYPE_HIERARCHY = 'java.action.showTypeHierarchy';
/**
* Show SuperType Hierarchy of given Selection.
*/
export const SHOW_SUPERTYPE_HIERARCHY = 'java.action.showSupertypeHierarchy';
/**
* Show SubType Hierarchy of given Selection.
*/
export const SHOW_SUBTYPE_HIERARCHY = 'java.action.showSubtypeHierarchy';
/**
* Show Type Hierarchy of given Selection.
*/
export const SHOW_CLASS_HIERARCHY = 'java.action.showClassHierarchy';
/**
* Change the base type of Type Hierarchy.
*/
export const CHANGE_BASE_TYPE = 'java.action.changeBaseType';
/**
* Open the given TypeHierarchy Item.
*/
export const OPEN_TYPE_HIERARCHY = 'java.navigate.openTypeHierarchy';
/**
* Resolve the given TypeHierarchy Item.
*/
export const RESOLVE_TYPE_HIERARCHY = 'java.navigate.resolveTypeHierarchy';
/**
* Show server task status
*/
Expand Down
29 changes: 0 additions & 29 deletions src/standardLanguageClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ import { snippetCompletionProvider } from "./snippetCompletionProvider";
import * as sourceAction from './sourceAction';
import { askForProjects, projectConfigurationUpdate, upgradeGradle } from "./standardLanguageClientUtils";
import { TracingLanguageClient } from './TracingLanguageClient';
import { TypeHierarchyDirection, TypeHierarchyItem } from "./typeHierarchy/protocol";
import { typeHierarchyTree } from "./typeHierarchy/typeHierarchyTree";
import { getAllJavaProjects, getAllProjects, getJavaConfiguration, isPrereleaseOrInsiderVersion } from "./utils";
import { Telemetry } from "./telemetry";
import { TelemetryEvent } from "@redhat-developer/vscode-redhat-telemetry/lib";
Expand Down Expand Up @@ -490,33 +488,6 @@ export class StandardLanguageClient {
}
}));

context.subscriptions.push(commands.registerCommand(Commands.SHOW_TYPE_HIERARCHY, (location: any) => {
if (location instanceof Uri) {
typeHierarchyTree.setTypeHierarchy(new Location(location, window.activeTextEditor.selection.active), TypeHierarchyDirection.both);
} else {
if (window.activeTextEditor?.document?.languageId !== "java") {
return;
}
typeHierarchyTree.setTypeHierarchy(new Location(window.activeTextEditor.document.uri, window.activeTextEditor.selection.active), TypeHierarchyDirection.both);
}
}));

context.subscriptions.push(commands.registerCommand(Commands.SHOW_CLASS_HIERARCHY, () => {
typeHierarchyTree.changeDirection(TypeHierarchyDirection.both);
}));

context.subscriptions.push(commands.registerCommand(Commands.SHOW_SUPERTYPE_HIERARCHY, () => {
typeHierarchyTree.changeDirection(TypeHierarchyDirection.parents);
}));

context.subscriptions.push(commands.registerCommand(Commands.SHOW_SUBTYPE_HIERARCHY, () => {
typeHierarchyTree.changeDirection(TypeHierarchyDirection.children);
}));

context.subscriptions.push(commands.registerCommand(Commands.CHANGE_BASE_TYPE, async (item: TypeHierarchyItem) => {
typeHierarchyTree.changeBaseItem(item);
}));

context.subscriptions.push(commands.registerCommand(Commands.BUILD_PROJECT, async (uris: Uri[] | Uri, isFullBuild: boolean, token: CancellationToken) => {
let resources: Uri[] = [];
if (uris instanceof Uri) {
Expand Down
Loading
Loading