diff --git a/ets2panda/bindings/src/buildConfigGenerate.ts b/ets2panda/bindings/src/buildConfigGenerate.ts index 478196c6aaaa569ab9b798c8eca2cc9879a506f8..23587ff2e30646c4aa9ae6771a60abaa302e14d4 100644 --- a/ets2panda/bindings/src/buildConfigGenerate.ts +++ b/ets2panda/bindings/src/buildConfigGenerate.ts @@ -16,9 +16,9 @@ import * as fs from 'fs'; import * as path from 'path'; import * as JSON5 from 'json5'; -import { BuildConfig } from './types'; +import { BuildConfig, PluginPathConfig } from './types'; -export interface ModuleDescriptor { +export interface ModuleDescriptor extends PluginPathConfig { arktsversion: string; name: string; moduleType: string; @@ -174,6 +174,11 @@ function createPluginMap(buildSdkPath: string): Record { return pluginMap; } +function addPluginPathConfigs(buildConfig: BuildConfig, module: ModuleDescriptor) { + buildConfig.aceModuleJsonPath = module.aceModuleJsonPath; // useless + buildConfig.consistentResourcePath = module.consistentResourcePath; +} + export function generateBuildConfigs( buildSdkPath: string, projectRoot: string, @@ -231,6 +236,7 @@ export function generateBuildConfigs( }; }) }; + addPluginPathConfigs(allBuildConfigs[module.name], module); } const outputPath = path.join(cacheDir, 'lsp_build_config.json'); if (!fs.existsSync(cacheDir)) { diff --git a/ets2panda/bindings/src/types.ts b/ets2panda/bindings/src/types.ts index ef956f40bf59c6ff70f8c7e172ac6a6574d098b1..33722af191a10704302749b2525452cb676e5117 100644 --- a/ets2panda/bindings/src/types.ts +++ b/ets2panda/bindings/src/types.ts @@ -151,7 +151,12 @@ export interface ModuleConfig { sourceRoots: string[]; } -export interface PathConfig { +export interface PluginPathConfig { + aceModuleJsonPath?: string; + consistentResourcePath?: string; +} + +export interface PathConfig extends PluginPathConfig { loaderOutPath: string; declgenDtsOutPath: string; declgenTsOutPath: string;