kirigaya/digital-ide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复 结构树中，设置顶层模块失效

Browse Source
This commit is contained in:
锦恢 2024-12-23 16:48:30 +08:00
parent e65b531da3
commit 0987738ed9
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/function/lsp/linter/manager.ts
View File

@ -329,11 +329,13 @@ export async function refreshWorkspaceDiagonastics(
await asyncConsumer(lintPaths, consumer, parallelChunk, progress);
} else if (linterMode === LinterMode.Common) {
// common, 只对打开文件进行操作
// 先清除所有的诊断结果
const clearConsumer = async (path: string) => {
await clearDiagnostics(client, path);
if (!isInitialise) {
// 先清除所有的诊断结果
const clearConsumer = async (path: string) => {
await clearDiagnostics(client, path);
}
await asyncConsumer(lintPaths, clearConsumer, parallelChunk);
}
await asyncConsumer(lintPaths, clearConsumer, parallelChunk);
// 再对激活区域进行诊断
const consumer = async (path: string) => {

35
src/function/treeView/tree.ts
View File

@ -137,7 +137,7 @@ class ModuleTreeProvider implements vscode.TreeDataProvider<ModuleDataItem> {
// set tooltip
treeItem.tooltip = element.path;
if (!treeItem.tooltip) {
treeItem.tooltip = t('info.treeview.item.tooltip');
treeItem.tooltip = 'src';
}
// set iconPath
@ -201,30 +201,33 @@ class ModuleTreeProvider implements vscode.TreeDataProvider<ModuleDataItem> {
const type = moduleType as keyof FirstTop;
// 默认选择依赖模块最多的作为 first top
let firstTop: { path: string, name: string } | undefined = undefined;
let maxDepSize = 0;
let firstTop = this.firstTop[type];
for (const hdlModule of topModules) {
// 此处断言是因为当前的 name 和 path 是从 topModules 中提取的
// 它们对应的 hdlModule 一定存在
const deps = hdlParam.getAllDependences(hdlModule.path, hdlModule.name)!;
const depSize = deps.include.length + deps.others.length;
if (depSize > maxDepSize) {
maxDepSize = depSize;
firstTop = { path: hdlModule.path, name: hdlModule.name };
if (!firstTop) {
let maxDepSize = 0;
for (const hdlModule of topModules) {
// 此处断言是因为当前的 name 和 path 是从 topModules 中提取的
// 它们对应的 hdlModule 一定存在
const deps = hdlParam.getAllDependences(hdlModule.path, hdlModule.name)!;
const depSize = deps.include.length + deps.others.length;
if (depSize > maxDepSize) {
maxDepSize = depSize;
firstTop = { path: hdlModule.path, name: hdlModule.name };
}
}
if (firstTop) {
// 将当前模块设置为 first top
this.setFirstTop(type, firstTop.name, firstTop.path);
}
}
if (firstTop === undefined) {
if (!firstTop) {
// 没有找到顶层模块，代表当前本来就是空的
// 此时 topModuleItemList 一定是 []
return topModuleItemList;
}
// 将当前模块设置为 first top
this.setFirstTop(type, firstTop.name, firstTop.path);
// 将 first top 放到数据列表开头
const firstTopIcon = this.makeFirstTopIconName(type);

4
src/manager/PL/index.ts
View File

@ -105,10 +105,6 @@ class PlManage extends BaseManage {
public setSrcTop(item: ModuleDataItem) {
this.context.ope.setSrcTop(item.name, this.context);
const type = moduleTreeProvider.getItemType(item);
console.log('set top');
console.log(type);
console.log(item);
if (type === HdlFileProjectType.Src) {
moduleTreeProvider.setFirstTop(HdlFileProjectType.Src, item.name, item.path);