openharmony/developtools_ace-ets2bundle
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_ace-ets2bundle.git synced 2026-07-20 19:47:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

!924 Fix multiline import declaration's ohmUrl replacement

Browse Source 
Merge pull request !924 from hufeng/fix_multilineImport
This commit is contained in:
openharmony_ci
2022-08-09 11:21:25 +00:00
committed by Gitee
parent 2f019bbf90 4fdddced19
commit de45fd6d8c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/src/validate_ui_syntax.ts
+4 -4
View File
@@ -1000,11 +1000,11 @@ export function processSystemApi(content: string, isProcessAllowList: boolean =
const REG_IMPORT_DECL: RegExp = isProcessAllowList ? projectConfig.compileMode === ESMODULE ?
/import\s+(.+)\s+from\s+['"]@(system|ohos)\.(\S+)['"]/g :
/(import|const)\s+(.+)\s*=\s*(\_\_importDefault\()?require\(\s*['"]@(system|ohos)\.(\S+)['"]\s*\)(\))?/g :
/(import|export)\s+(.+)\s+from\s+['"](\S+)['"]|import\s+(.+)\s*=\s*require\(\s*['"](\S+)['"]\s*\)/g;
/(import|export)\s+(?:(.+)|\{([\s\S]+)\})\s+from\s+['"](\S+)['"]|import\s+(.+)\s*=\s*require\(\s*['"](\S+)['"]\s*\)/g;
const systemValueCollection: Set<string> = new Set();
const processedContent: string = content.replace(REG_IMPORT_DECL, (item, item1, item2, item3, item4, item5) => {
const importValue: string = isProcessAllowList ? projectConfig.compileMode === ESMODULE ? item1 : item2 : item2 || item4;
const processedContent: string = content.replace(REG_IMPORT_DECL, (item, item1, item2, item3, item4, item5, item6) => {
const importValue: string = isProcessAllowList ? projectConfig.compileMode === ESMODULE ? item1 : item2 : item2 || item5;
if (isProcessAllowList) {
systemValueCollection.add(importValue);
@@ -1016,7 +1016,7 @@ export function processSystemApi(content: string, isProcessAllowList: boolean =
return replaceSystemApi(item, importValue, item2, item3);
}
const moduleRequest: string = item3 || item5;
const moduleRequest: string = item4 || item6;
if (isOhmUrl(moduleRequest)) { // ohmURL
return replaceOhmUrl(isSystemModule, item, importValue, moduleRequest, sourcePath);
} else if (/^@(system|ohos)\./.test(moduleRequest)) { // ohos/system.api