Making sure @insert and the following token came from the same file.

Author: ReFreezed

preprocess.lua

@@ -1879,7 +1879,7 @@ local function doLateExpansionsResources(tokensToExpand, fileBuffers, params, st
 			local tokNext, iNext = getNextUsableToken(tokenStack, #tokenStack-1, nil, -1)
 
 			-- @insert "name"
-			if ppKeywordTok.value == "insert" and isTokenAndNotNil(tokNext, "string") then
+			if ppKeywordTok.value == "insert" and isTokenAndNotNil(tokNext, "string") and tokNext.file == ppKeywordTok.file then
 				local nameTok = tokNext
 				popTokens(tokenStack, iNext) -- the string
 
@@ -1936,7 +1936,7 @@ local function doLateExpansionsResources(tokensToExpand, fileBuffers, params, st
 			-- @insert identifier ( argument1, ... )
 			-- @insert identifier " ... "
 			-- @insert identifier { ... }
-			elseif ppKeywordTok.value == "insert" and isTokenAndNotNil(tokNext, "identifier") then
+			elseif ppKeywordTok.value == "insert" and isTokenAndNotNil(tokNext, "identifier") and tokNext.file == ppKeywordTok.file then
 				local identTok = tokNext
 				tokNext, iNext = getNextUsableToken(tokenStack, iNext-1, nil, -1)
 
@@ -2034,6 +2034,7 @@ local function processPreprocessorBlockInMacroArgument(tokens, fileBuffers, toke
 end
 
 local function expandMacro(tokens, fileBuffers, tokenStack, macroStartTok, isNested)
+	-- @Robustness: Make sure key tokens came from the same source file.
 	local tokNext, iNext = getNextUsableToken(tokenStack, #tokenStack-1, nil, -1)
 
 	if not isTokenAndNotNil(tokNext, "identifier") then

tests/quickTest.lua2p

@@ -79,8 +79,8 @@ print(s:match(funcCall)) -- "hello5( foo )"
 @insert "tests/quickTest.luapart"
 print("Metaprogram - someString: "..someString)
 )
-local uhh1 = !(@insert"tests/quickTest.txt")
-local uhh2 = !(@@"tests/quickTest.txt") -- @@ means the same as @insert.
+local uhh1 = !(@insert"tests/quickTest_expression.txt")
+local uhh2 = !(@@"tests/quickTest_expression.txt") -- @@ means the same as @insert.
 print("Final program - uhh: "..uhh1..", "..uhh2)
 
 
@@ -129,7 +129,7 @@ local f = @@PASS_THROUGH(function(a, b)
 	return "", nil
 end)
 
-local x = @@PASS_THROUGH( @@"tests/quickTest.txt" )
+local x = @@PASS_THROUGH( @@"tests/quickTest_expression.txt" )
 
 local x1 = @@PASS_THROUGH( 1 + !!( "2" ) + 3 )
 local x2 = @@PASS_THROUGH{ 1 + !!( "2" ) + 3 }

tests/quickTest.txt tests/quickTest_expression.txttests/quickTest.txt renamed to tests/quickTest_expression.txt

@@ -0,0 +1 @@
+type