Skip to content

add support of [[ & ]] string require path in lua source code #1509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
XavierCHN wants to merge 2 commits into from
Closed

add support of [[ & ]] string require path in lua source code #1509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e460ba
Literal string surrounded with [[ & ]] includes require('path') cause…
XavierCHN Oct 20, 2023
52f102f
add missint unit tests
XavierCHN Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/transpilation/find-lua-requires.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ function findRequire(lua: string, offset: number): LuaRequire[] {
} else {
offset = m.end;
}
} else if (c === '"' || c === "'") {
} else if (
c === '"' || c === "'"
// string literal surrounded by [[ & ]]
|| (c === "[" && offset + 1 < lua.length && lua[offset + 1] === "[")
) {
offset = readString(lua, offset, c).offset; // Skip string and surrounding quotes
} else if (c === "-" && offset + 1 < lua.length && lua[offset + 1] === "-") {
offset = skipComment(lua, offset);
Expand Down Expand Up @@ -106,7 +110,11 @@ function readString(lua: string, offset: number, delimiter: string): { value: st
if (lua[offset] === "\\" && !escaped) {
escaped = true;
} else {
if (lua[offset] === delimiter) {
if (
(delimiter !== "[" && lua[offset] === delimiter)
// string literal surrounded by [[ & ]]
|| (delimiter === "[" && offset + 1 < lua.length && lua[offset] === "]" && lua[offset + 1] === "]")
) {
result += lua.slice(start, offset - 1);
start = offset;
}
Expand Down
9 changes: 6 additions & 3 deletions test/unit/find-lua-requires.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,15 @@ test("ignores requires that should not be included", () => {
require('req2')
local b = 'require("This should not be included")'
require("req3")
-- require("this should not be included")
local c = [[require("This should not be included")]]
require("req4")
--[[ require("this should not be included") ]]
-- require("this should not be included")
require("req5")
--[[ require("this should not be included") ]]
require("req6")

`;
expect(requirePaths(findLuaRequires(lua))).toEqual(["req1", "req2", "req3", "req4", "req5"]);
expect(requirePaths(findLuaRequires(lua))).toEqual(["req1", "req2", "req3", "req4", "req5", "req6"]);
});

test("non-terminated require", () => {
Expand Down