openharmony/ace_ace_engine
1
0
Fork 0
mirror of https://github.com/openharmony/ace_ace_engine.git synced 2026-07-19 14:43:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Descriptor: fix stack message error

Browse Source 
details:
1. support print stack function name
2. modify source info fail of empty line
issue: https://gitee.com/openharmony/ace_ace_engine/issues/I52CE6

Signed-off-by: wengchangcheng <wengchangcheng@huawei.com>
Change-Id: I1866134afe20954c4a1078feca936a69b7ed7d5e
This commit is contained in:
wengchangcheng
2022-04-12 16:34:51 +08:00
parent 63ff85dc75
commit 34f33b835f
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/bridge/js_frontend/engine/jsi/jsi_base_utils.cpp
+14 -10
View File
@@ -103,6 +103,8 @@ std::string JsiBaseUtils::TransSourceStack(RefPtr<JsAcePage> runningPage, const
std::string JsiBaseUtils::JsiDumpSourceFile(const std::string& stackStr, const RefPtr<RevSourceMap>& pageMap,
const RefPtr<RevSourceMap>& appMap, const AceType *data)
{
const std::string closeBrace = ")";
const std::string openBrace = "(";
std::string ans = "";
std::string tempStack = stackStr;
int32_t appFlag = static_cast<int32_t>(tempStack.find("app_.js"));
@@ -113,12 +115,14 @@ std::string JsiBaseUtils::JsiDumpSourceFile(const std::string& stackStr, const R
ExtractEachInfo(tempStack, res);
// collect error info first
ans = ans + res[0] + "\n";
for (uint32_t i = 1; i < res.size(); i++) {
std::string temp = res[i];
int32_t closeBracePos = temp.find(closeBrace);
int32_t openBracePos = temp.find(openBrace);
std::string line = "";
std::string column = "";
GetPosInfo(temp, line, column);
GetPosInfo(temp, closeBracePos, line, column);
if (line.empty() || column.empty()) {
LOGI("the stack without line info");
break;
@@ -128,12 +132,13 @@ std::string JsiBaseUtils::JsiDumpSourceFile(const std::string& stackStr, const R
if (sourceInfo.empty()) {
break;
}
temp = "at " + sourceInfo;
temp.replace(openBracePos, closeBracePos - openBracePos + 1, sourceInfo);
ans = ans + temp + "\n";
}
if (ans.empty()) {
return tempStack;
}
ans = res[0] + "\n" + ans;
return ans;
}
@@ -148,24 +153,23 @@ void JsiBaseUtils::ExtractEachInfo(const std::string& tempStack, std::vector<std
tempStr += tempStack[i];
}
}
res.push_back(tempStr);
if (!tempStr.empty()) {
res.push_back(tempStr);
}
}
void JsiBaseUtils::GetPosInfo(const std::string& temp, std::string& line, std::string& column)
void JsiBaseUtils::GetPosInfo(const std::string& temp, int32_t start, std::string& line, std::string& column)
{
// 0 for colum, 1 for row
int32_t flag = 0;
// find line, column
for (int32_t i = static_cast<int32_t>(temp.length()) - 1; i > 0; i--) {
for (int32_t i = start - 1; i > 0; i--) {
if (temp[i] == ':') {
flag += 1;
continue;
}
// some stack line may end with ")"
if (flag == 0) {
if (temp[i] >= '0' && temp[i] <= '9') {
column = temp[i] + column;
}
column = temp[i] + column;
} else if (flag == 1) {
line = temp[i] + line;
} else {
frameworks/bridge/js_frontend/engine/jsi/jsi_base_utils.h
+1 -1
View File
@@ -67,7 +67,7 @@ private:
static std::string JsiDumpSourceFile(const std::string& stackStr, const RefPtr<RevSourceMap>& pageMap,
const RefPtr<RevSourceMap>& appMap, const AceType *data = nullptr);
static void ExtractEachInfo(const std::string& tempStack, std::vector<std::string>& res);
static void GetPosInfo(const std::string& temp, std::string& line, std::string& column);
static void GetPosInfo(const std::string& temp, int32_t start, std::string& line, std::string& column);
static std::string GetSourceInfo(const std::string& line, const std::string& column,
const RefPtr<RevSourceMap>& pageMap, const RefPtr<RevSourceMap>& appMap, bool isAppPage, const AceType *data);
static std::string GetRelativePath(const std::string& sources);