From 32f70356caabb849b4b04e02c548e5ff4f81e9da Mon Sep 17 00:00:00 2001
From: houhaoyu <houhaoyu@huawei.com>
Date: Mon, 14 Mar 2022 20:31:45 +0800
Subject: [PATCH] houhaoyu@huawei.com

fix debugline fileName

Signed-off-by: houhaoyu <houhaoyu@huawei.com>
Change-Id: I7281b084b11a89e87e37e9889cd41a8c8c0caf08
---
 compiler/server/build_pipe_server.js    |  6 ++++--
 compiler/src/process_component_build.ts | 16 ++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/compiler/server/build_pipe_server.js b/compiler/server/build_pipe_server.js
index fbc9c398c..a7be44abb 100644
--- a/compiler/server/build_pipe_server.js
+++ b/compiler/server/build_pipe_server.js
@@ -25,7 +25,8 @@ let pluginSocket = '';
 let supplement = {
   isAcceleratePreview: false,
   line: 0,
-  column: 0
+  column: 0,
+  fileName: ''
 }
 
 const pluginCommandChannelMessageHandlers = {
@@ -63,7 +64,8 @@ function handlePluginCompileComponent(jsonData) {
   supplement = {
     isAcceleratePreview: true,
     line: parseInt(JSON.parse(receivedMsg.data.offset).line),
-    column: parseInt(JSON.parse(receivedMsg.data.offset).column)
+    column: parseInt(JSON.parse(receivedMsg.data.offset).column),
+    fileName: receivedMsg.data.filePath
   }
   processComponentChild(sourceNode, previewStatements, log, supplement);
   supplement.isAcceleratePreview = false;
diff --git a/compiler/src/process_component_build.ts b/compiler/src/process_component_build.ts
index 6831aa253..2ebdf03d2 100644
--- a/compiler/src/process_component_build.ts
+++ b/compiler/src/process_component_build.ts
@@ -151,13 +151,15 @@ function validateRootNode(node: ts.MethodDeclaration, log: LogInfo[]): boolean {
 interface supplementType {
   isAcceleratePreview: boolean,
   line: number,
-  column: number
+  column: number,
+  fileName: string
 }
 
 let newsupplement: supplementType = {
   isAcceleratePreview: false,
   line: 0,
-  column: 0
+  column: 0,
+  fileName: ''
 };
 
 function validateEtsComponentNode(node: ts.CallExpression | ts.EtsComponentExpression) {
@@ -173,8 +175,8 @@ function validateEtsComponentNode(node: ts.CallExpression | ts.EtsComponentExpre
   }
 }
 
-export function processComponentChild(node: ts.Block | ts.SourceFile, newStatements: ts.Statement[],
-  log: LogInfo[], supplement: supplementType = {isAcceleratePreview: false, line: 0, column: 0}): void {
+export function processComponentChild(node: ts.Block | ts.SourceFile, newStatements: ts.Statement[], log: LogInfo[],
+  supplement: supplementType = {isAcceleratePreview: false, line: 0, column: 0, fileName: ''}): void {
   if (supplement.isAcceleratePreview) {
     newsupplement = supplement;
   }
@@ -290,7 +292,7 @@ function processInnerComponent(node: ts.ExpressionStatement, index: number, arr:
     const posOfNode: ts.LineAndCharacter =
       transformLog.sourceFile.getLineAndCharacterOfPosition(getRealNodePos(node));
     const projectPath: string = projectConfig.projectPath;
-    const curFileName: string = transformLog.sourceFile.fileName.replace(/.ts$/, '');
+    let curFileName: string = transformLog.sourceFile.fileName.replace(/.ts$/, '');
     let line: number = 1;
     let col: number = 1;
     if (newsupplement.isAcceleratePreview) {
@@ -298,11 +300,13 @@ function processInnerComponent(node: ts.ExpressionStatement, index: number, arr:
         col = newsupplement.column;
       }
       line = newsupplement.line;
+      curFileName = newsupplement.fileName;
     }
     newsupplement = {
       isAcceleratePreview: false,
       line: 0,
-      column: 0
+      column: 0,
+      fileName: ''
     };
     const debugInfo: string =
       `${path.relative(projectPath, curFileName).replace(/\\+/g, '/')}` +
-- 
Gitee