@chrrxs/robloxstudio-mcp-inspector 2.19.0 → 2.19.1

package/studio-plugin/MCPPlugin.rbxmx

@@ -33,6 +33,9 @@ StopPlayMonitor.init(plugin)
 BreakpointHandlers.init(plugin)
 ServerUrlSettings.init(plugin)
 local function applyRememberedServerUrl()
+	if ClientBroker.forkRole() == "client" then
+		return nil
+	end
 	local rememberedServerUrl = ServerUrlSettings.readServerUrl()
 	if rememberedServerUrl == nil then
 		return nil
@@ -1410,9 +1413,9 @@ local function computeBridgeStamp()
 	for i = 1, #combined do
 		h = (h * 33 + (string.byte(combined, i))) % 2147483647
 	end
-	-- "2.19.0" is replaced with the package version at package time
+	-- "2.19.1" is replaced with the package version at package time
 	-- (scripts/build-plugin.mjs injectVersion), so a release bump also restamps.
-	return `{tostring(h)}-2.19.0`
+	return `{tostring(h)}-2.19.1`
 end
 local BRIDGE_STAMP = computeBridgeStamp()
 local function setSource(scriptInst, source)
@@ -7419,6 +7422,65 @@ local function getProjectStructure(requestData)
 	result.timestamp = tick()
 	return result
 end
+-- Split a Lua pattern on TOP-LEVEL "|" into alternatives. Lua patterns have no
+-- alternation operator, so "foo|bar" would otherwise be matched as the literal
+-- text "foo|bar" and silently never hit. "%|" stays a literal pipe, and "%bxy"
+-- keeps both balanced-match delimiter characters.
+local function splitLuaAlternation(pattern)
+	local parts = {}
+	local current = ""
+	local i = 1
+	local n = #pattern
+	local inCharClass = false
+	while i <= n do
+		local c = string.sub(pattern, i, i)
+		if c == "%" then
+			if string.sub(pattern, i + 1, i + 1) == "b" then
+				current ..= string.sub(pattern, i, math.min(i + 3, n))
+				i += 4
+				continue
+			end
+			-- Preserve an escape pair (e.g. %|, %., %d) intact.
+			current ..= string.sub(pattern, i, i + 1)
+			i += 2
+		elseif c == "[" then
+			inCharClass = true
+			current ..= c
+			i += 1
+		elseif c == "]" then
+			inCharClass = false
+			current ..= c
+			i += 1
+		elseif c == "|" and not inCharClass then
+			local _current = current
+			table.insert(parts, _current)
+			current = ""
+			i += 1
+		else
+			current ..= c
+			i += 1
+		end
+	end
+	local _current = current
+	table.insert(parts, _current)
+	return parts
+end
+-- Return the earliest match across alternatives (mirrors regex alternation).
+local function findFirstPattern(line, alternatives)
+	local bestStart
+	local bestEnd
+	for _, alt in alternatives do
+		if alt == "" then
+			continue
+		end
+		local s, e = string.find(line, alt)
+		if s ~= nil and (bestStart == nil or s < bestStart) then
+			bestStart = s
+			bestEnd = e
+		end
+	end
+	return { bestStart, bestEnd }
+end
 local function grepScripts(requestData)
 	local pattern = requestData.pattern
 	if not (pattern ~= "" and pattern) then
@@ -7426,11 +7488,27 @@ local function grepScripts(requestData)
 			error = "pattern is required",
 		}
 	end
-	local _condition = (requestData.caseSensitive)
+	local _condition = (requestData.usePattern)
 	if _condition == nil then
 		_condition = false
 	end
-	local caseSensitive = _condition
+	local usePattern = _condition
+	if usePattern and requestData.caseSensitive == false then
+		return {
+			error = "Case-insensitive Lua pattern search is not supported. Omit caseSensitive or pass caseSensitive: true with usePattern: true, or use literal search.",
+		}
+	end
+	local _result
+	if usePattern then
+		_result = true
+	else
+		local _condition_1 = (requestData.caseSensitive)
+		if _condition_1 == nil then
+			_condition_1 = false
+		end
+		_result = _condition_1
+	end
+	local caseSensitive = _result
 	local _condition_1 = (requestData.contextLines)
 	if _condition_1 == nil then
 		_condition_1 = 0
@@ -7446,21 +7524,16 @@ local function grepScripts(requestData)
 		_condition_3 = 0
 	end
 	local maxResultsPerScript = _condition_3
-	local _condition_4 = (requestData.usePattern)
+	local _condition_4 = (requestData.filesOnly)
 	if _condition_4 == nil then
 		_condition_4 = false
 	end
-	local usePattern = _condition_4
-	local _condition_5 = (requestData.filesOnly)
+	local filesOnly = _condition_4
+	local _condition_5 = (requestData.path)
 	if _condition_5 == nil then
-		_condition_5 = false
+		_condition_5 = ""
 	end
-	local filesOnly = _condition_5
-	local _condition_6 = (requestData.path)
-	if _condition_6 == nil then
-		_condition_6 = ""
-	end
-	local searchPath = _condition_6
+	local searchPath = _condition_5
 	local classFilter = requestData.classFilter
 	local startInstance = if searchPath ~= "" then getInstanceByPath(searchPath) else game
 	if not startInstance then
@@ -7470,6 +7543,8 @@ local function grepScripts(requestData)
 	end
 	-- Prepare pattern for matching
 	local searchPattern = if caseSensitive then pattern else string.lower(pattern)
+	-- Pre-split top-level "|" alternation once (pattern mode only).
+	local patternAlternatives = if usePattern then splitLuaAlternation(searchPattern) else nil
 	local results = {}
 	local totalMatches = 0
 	local scriptsSearched = 0
@@ -7505,7 +7580,9 @@ local function grepScripts(requestData)
 				local matchStart
 				local matchEnd
 				if usePattern then
-					matchStart, matchEnd = string.find(searchLine, searchPattern)
+					local _binding_1 = findFirstPattern(searchLine, patternAlternatives)
+					matchStart = _binding_1[1]
+					matchEnd = _binding_1[2]
 				else
 					matchStart, matchEnd = string.find(searchLine, searchPattern, 1, true)
 				end
@@ -7997,6 +8074,9 @@ local joinLines = _binding.joinLines
 local _binding_1 = Recording
 local beginRecording = _binding_1.beginRecording
 local finishRecording = _binding_1.finishRecording
+local SOURCE_TRUNCATE_CHAR_BUDGET = 25000
+local SOURCE_TRUNCATE_LINE_BUDGET = 400
+local SOURCE_TRUNCATE_TO_LINES = 300
 local function normalizeEscapes(s)
 	local result = s
 	result = (string.gsub(result, "\\\\", "\x01"))
@@ -8007,6 +8087,44 @@ local function normalizeEscapes(s)
 	result = (string.gsub(result, "\x01", "\\"))
 	return result
 end
+local function getTopServiceName(instance)
+	local topServiceInst = instance
+	while topServiceInst.Parent and topServiceInst.Parent ~= game do
+		topServiceInst = topServiceInst.Parent
+	end
+	return topServiceInst.Name
+end
+local function sliceLines(lines, startLine, endLine)
+	local selectedLines = {}
+	do
+		local i = startLine
+		local _shouldIncrement = false
+		while true do
+			if _shouldIncrement then
+				i += 1
+			else
+				_shouldIncrement = true
+			end
+			if not (i <= endLine) then
+				break
+			end
+			local _condition = lines[i]
+			if _condition == nil then
+				_condition = ""
+			end
+			table.insert(selectedLines, _condition)
+		end
+	end
+	return selectedLines
+end
+local function numberLines(lines, lineOffset)
+	local numberedLines = {}
+	for i = 0, #lines - 1 do
+		local _arg0 = `{i + lineOffset}: {lines[i + 1]}`
+		table.insert(numberedLines, _arg0)
+	end
+	return table.concat(numberedLines, "\n")
+end
 local function getScriptSource(requestData)
 	local instancePath = requestData.instancePath
 	local startLine = requestData.startLine
@@ -8031,105 +8149,58 @@ local function getScriptSource(requestData)
 		local fullSource = readScriptSource(instance)
 		local lines, hasTrailingNewline = splitLines(fullSource)
 		local totalLineCount = #lines
-		local sourceToReturn = fullSource
-		local returnedStartLine = 1
-		local returnedEndLine = totalLineCount
-		if startLine ~= nil or endLine ~= nil then
+		local explicitRange = startLine ~= nil or endLine ~= nil
+		local shouldTruncate = not explicitRange and (#fullSource > SOURCE_TRUNCATE_CHAR_BUDGET or totalLineCount > SOURCE_TRUNCATE_LINE_BUDGET)
+		local _result
+		if explicitRange then
 			local _condition = startLine
 			if _condition == nil then
 				_condition = 1
 			end
-			local actualStartLine = math.max(1, _condition)
-			local _exp = #lines
-			local _condition_1 = endLine
-			if _condition_1 == nil then
-				_condition_1 = #lines
-			end
-			local actualEndLine = math.min(_exp, _condition_1)
-			local selectedLines = {}
-			do
-				local i = actualStartLine
-				local _shouldIncrement = false
-				while true do
-					if _shouldIncrement then
-						i += 1
-					else
-						_shouldIncrement = true
-					end
-					if not (i <= actualEndLine) then
-						break
-					end
-					local _condition_2 = lines[i]
-					if _condition_2 == nil then
-						_condition_2 = ""
-					end
-					table.insert(selectedLines, _condition_2)
+			_result = math.max(1, _condition)
+		else
+			_result = 1
+		end
+		local returnedStartLine = _result
+		local _result_1
+		if shouldTruncate then
+			_result_1 = math.min(SOURCE_TRUNCATE_TO_LINES, totalLineCount)
+		else
+			local _result_2
+			if explicitRange then
+				local _condition = endLine
+				if _condition == nil then
+					_condition = totalLineCount
 				end
+				_result_2 = math.min(totalLineCount, _condition)
+			else
+				_result_2 = totalLineCount
 			end
-			sourceToReturn = table.concat(selectedLines, "\n")
-			if hasTrailingNewline and actualEndLine == #lines and string.sub(sourceToReturn, -1) ~= "\n" then
-				sourceToReturn ..= "\n"
-			end
-			returnedStartLine = actualStartLine
-			returnedEndLine = actualEndLine
-		end
-		local numberedLines = {}
-		local linesToNumber = if startLine ~= nil then (splitLines(sourceToReturn)) else lines
-		local lineOffset = returnedStartLine - 1
-		for i = 0, #linesToNumber - 1 do
-			local _arg0 = `{i + 1 + lineOffset}: {linesToNumber[i + 1]}`
-			table.insert(numberedLines, _arg0)
+			_result_1 = _result_2
 		end
-		local numberedSource = table.concat(numberedLines, "\n")
+		local returnedEndLine = _result_1
+		local selectedLines = if (explicitRange or shouldTruncate) then sliceLines(lines, returnedStartLine, returnedEndLine) else lines
+		local sourceToReturn = if explicitRange then joinLines(selectedLines, hasTrailingNewline and returnedEndLine == totalLineCount) elseif shouldTruncate then table.concat(selectedLines, "\n") else fullSource
 		local resp = {
 			instancePath = instancePath,
 			className = instance.ClassName,
 			name = instance.Name,
 			source = sourceToReturn,
-			numberedSource = numberedSource,
+			numberedSource = numberLines(selectedLines, returnedStartLine),
 			sourceLength = #fullSource,
 			lineCount = totalLineCount,
 			startLine = returnedStartLine,
 			endLine = returnedEndLine,
-			isPartial = startLine ~= nil or endLine ~= nil,
-			truncated = false,
+			isPartial = explicitRange,
+			truncated = shouldTruncate,
 		}
-		if startLine == nil and endLine == nil and #fullSource > 50000 then
-			local truncatedLines = {}
-			local truncatedNumberedLines = {}
-			local maxLines = math.min(1000, #lines)
-			do
-				local i = 0
-				local _shouldIncrement = false
-				while true do
-					if _shouldIncrement then
-						i += 1
-					else
-						_shouldIncrement = true
-					end
-					if not (i < maxLines) then
-						break
-					end
-					local _arg0 = lines[i + 1]
-					table.insert(truncatedLines, _arg0)
-					local _arg0_1 = `{i + 1}: {lines[i + 1]}`
-					table.insert(truncatedNumberedLines, _arg0_1)
-				end
-			end
-			resp.source = table.concat(truncatedLines, "\n")
-			resp.numberedSource = table.concat(truncatedNumberedLines, "\n")
-			resp.truncated = true
-			resp.endLine = maxLines
-			resp.note = "Script truncated to first 1000 lines. Use startLine/endLine parameters to read specific sections."
+		if shouldTruncate then
+			resp.note = `Script truncated to first {returnedEndLine} of {totalLineCount} lines ({#fullSource} chars). Use line_range to read specific sections.`
 		end
 		if instance:IsA("BaseScript") then
 			resp.enabled = instance.Enabled
 		end
-		local topServiceInst = instance
-		while topServiceInst.Parent and topServiceInst.Parent ~= game do
-			topServiceInst = topServiceInst.Parent
-		end
-		resp.topService = topServiceInst.Name
+		resp.topService = getTopServiceName(instance)
 		return resp
 	end)
 	if success then
@@ -9673,25 +9744,13 @@ local function multiplayerTestLeaveClient(_requestData)
 		localPlayer = localPlayer,
 	}
 end
-local function multiplayerTestEnd(requestData)
-	if not RunService:IsRunning() or not RunService:IsServer() then
-		return {
-			error = "multiplayer_test_end must be called on the running server peer. Route with target=server.",
-		}
-	end
-	local value = if requestData.value ~= nil then requestData.value else "ended_by_mcp"
-	local ok, result = pcall(function()
-		return StudioTestService:EndTest(value)
-	end)
-	if not ok then
-		return {
-			error = tostring(result),
-		}
-	end
+local function multiplayerTestEnd(_requestData)
 	return {
-		success = true,
-		message = "Multiplayer Studio test end requested.",
-		value = value,
+		success = false,
+		error = "multiplayer_stop_disabled",
+		message = "Multiplayer playtest stop/end is disabled because StudioTestService:EndTest is currently broken for this flow. Manually close the Studio multiplayer test windows instead.",
+		reason = "StudioTestService:EndTest does not reliably end StudioTestService multiplayer sessions from MCP right now.",
+		manualCleanupRequired = true,
 	}
 end
 return {
@@ -10580,7 +10639,7 @@ local function addUnique(values, value)
 		table.insert(_values_1, _value_1)
 	end
 end
-local function computeInstanceIds()
+local function computeInstanceIds(options)
 	local ids = {}
 	if game.PlaceId ~= 0 then
 		addUnique(ids, `place:{tostring(game.PlaceId)}`)
@@ -10588,12 +10647,22 @@ local function computeInstanceIds()
 	local existing = ServerStorage:GetAttribute("__MCPPlaceId")
 	if type(existing) == "string" and existing ~= "" then
 		addUnique(ids, `anon:{existing}`)
-	elseif game.PlaceId == 0 then
-		local fresh = HttpService:GenerateGUID(false)
-		pcall(function()
-			return ServerStorage:SetAttribute("__MCPPlaceId", fresh)
-		end)
-		addUnique(ids, `anon:{fresh}`)
+	else
+		local _condition = game.PlaceId == 0
+		if _condition then
+			local _result = options
+			if _result ~= nil then
+				_result = _result.createAnonymous
+			end
+			_condition = _result == true
+		end
+		if _condition then
+			local fresh = HttpService:GenerateGUID(false)
+			pcall(function()
+				return ServerStorage:SetAttribute("__MCPPlaceId", fresh)
+			end)
+			addUnique(ids, `anon:{fresh}`)
+		end
 	end
 	return ids
 end
@@ -10630,7 +10699,9 @@ local function rememberServerUrl(serverUrl)
 		return nil
 	end
 	writeSettingString(GLOBAL_SETTING_KEY, normalized)
-	for _, instanceId in computeInstanceIds() do
+	for _, instanceId in computeInstanceIds({
+		createAnonymous = true,
+	}) do
 		writeSettingString(settingKey(instanceId), normalized)
 		writeSettingString(legacySettingKey(instanceId), normalized)
 	end
@@ -10639,6 +10710,9 @@ local function readServerUrl()
 	if not pluginRef then
 		return nil
 	end
+	-- Reading settings should not mint a place identity. Client play DMs have
+	-- their own ServerStorage; creating an id there makes a misleading anon id
+	-- that never matches the edit/server bridge identity.
 	for _, instanceId in computeInstanceIds() do
 		local remembered = readSettingString(settingKey(instanceId))
 		if remembered ~= nil then
@@ -10671,7 +10745,7 @@ return {
         <Properties>
           <string name="Name">State</string>
           <string name="Source"><![CDATA[-- Compiled with roblox-ts v3.0.0
-local CURRENT_VERSION = "2.19.0"
+local CURRENT_VERSION = "2.19.1"
 local PLUGIN_VARIANT = "main"
 local BASE_PORT = 58741
 local function createConnection(port)
@@ -12028,6 +12102,38 @@ local function convertPropertyValue(instance, propertyName, propertyValue)
 				end
 				return UDim2.new(_condition_1, _condition_2, _condition_3, _condition_4)
 			end
+			local success, currentVal = pcall(function()
+				return inst[propertyName]
+			end)
+			if success then
+				local currentType = typeof(currentVal)
+				if currentType == "Vector2" then
+					local _condition_1 = (tbl.X)
+					if _condition_1 == nil then
+						_condition_1 = 0
+					end
+					local _condition_2 = (tbl.Y)
+					if _condition_2 == nil then
+						_condition_2 = 0
+					end
+					return Vector2.new(_condition_1, _condition_2)
+				end
+				if currentType == "Vector3" then
+					local _condition_1 = (tbl.X)
+					if _condition_1 == nil then
+						_condition_1 = 0
+					end
+					local _condition_2 = (tbl.Y)
+					if _condition_2 == nil then
+						_condition_2 = 0
+					end
+					local _condition_3 = (tbl.Z)
+					if _condition_3 == nil then
+						_condition_3 = 0
+					end
+					return Vector3.new(_condition_1, _condition_2, _condition_3)
+				end
+			end
 			local _condition_1 = (tbl.X)
 			if _condition_1 == nil then
 				_condition_1 = 0

package/studio-plugin/src/modules/ServerUrlSettings.ts

@@ -41,7 +41,7 @@ function addUnique(values: string[], value: string): void {
 	}
 }
 
-function computeInstanceIds(): string[] {
+function computeInstanceIds(options?: { createAnonymous?: boolean }): string[] {
 	const ids: string[] = [];
 	if (game.PlaceId !== 0) {
 		addUnique(ids, `place:${tostring(game.PlaceId)}`);
@@ -49,7 +49,7 @@ function computeInstanceIds(): string[] {
 	const existing = ServerStorage.GetAttribute("__MCPPlaceId");
 	if (typeIs(existing, "string") && existing !== "") {
 		addUnique(ids, `anon:${existing as string}`);
-	} else if (game.PlaceId === 0) {
+	} else if (game.PlaceId === 0 && options?.createAnonymous === true) {
 		const fresh = HttpService.GenerateGUID(false);
 		pcall(() => ServerStorage.SetAttribute("__MCPPlaceId", fresh));
 		addUnique(ids, `anon:${fresh}`);
@@ -83,7 +83,7 @@ function rememberServerUrl(serverUrl: string): void {
 	const normalized = normalizeServerUrl(serverUrl);
 	if (!pluginRef || normalized === "") return;
 	writeSettingString(GLOBAL_SETTING_KEY, normalized);
-	for (const instanceId of computeInstanceIds()) {
+	for (const instanceId of computeInstanceIds({ createAnonymous: true })) {
 		writeSettingString(settingKey(instanceId), normalized);
 		writeSettingString(legacySettingKey(instanceId), normalized);
 	}
@@ -91,6 +91,9 @@ function rememberServerUrl(serverUrl: string): void {
 
 function readServerUrl(): string | undefined {
 	if (!pluginRef) return undefined;
+	// Reading settings should not mint a place identity. Client play DMs have
+	// their own ServerStorage; creating an id there makes a misleading anon id
+	// that never matches the edit/server bridge identity.
 	for (const instanceId of computeInstanceIds()) {
 		const remembered = readSettingString(settingKey(instanceId));
 		if (remembered !== undefined) return remembered;

package/studio-plugin/src/modules/Utils.ts

@@ -305,6 +305,23 @@ function convertPropertyValue(instance: Instance, propertyName: string, property
 					yTbl.Scale ?? 0, yTbl.Offset ?? 0,
 				);
 			}
+			const [success, currentVal] = pcall(() => inst[propertyName]);
+			if (success) {
+				const currentType = typeOf(currentVal);
+				if (currentType === "Vector2") {
+					return new Vector2(
+						(tbl.X as number) ?? 0,
+						(tbl.Y as number) ?? 0,
+					);
+				}
+				if (currentType === "Vector3") {
+					return new Vector3(
+						(tbl.X as number) ?? 0,
+						(tbl.Y as number) ?? 0,
+						(tbl.Z as number) ?? 0,
+					);
+				}
+			}
 			return new Vector3(
 				(tbl.X as number) ?? 0,
 				(tbl.Y as number) ?? 0,

package/studio-plugin/src/modules/handlers/QueryHandlers.ts

@@ -564,15 +564,78 @@ function getProjectStructure(requestData: Record<string, unknown>) {
 	return result;
 }
 
+// Split a Lua pattern on TOP-LEVEL "|" into alternatives. Lua patterns have no
+// alternation operator, so "foo|bar" would otherwise be matched as the literal
+// text "foo|bar" and silently never hit. "%|" stays a literal pipe, and "%bxy"
+// keeps both balanced-match delimiter characters.
+function splitLuaAlternation(pattern: string): string[] {
+	const parts: string[] = [];
+	let current = "";
+	let i = 1;
+	const n = pattern.size();
+	let inCharClass = false;
+	while (i <= n) {
+		const c = string.sub(pattern, i, i);
+		if (c === "%") {
+			if (string.sub(pattern, i + 1, i + 1) === "b") {
+				current += string.sub(pattern, i, math.min(i + 3, n));
+				i += 4;
+				continue;
+			}
+			// Preserve an escape pair (e.g. %|, %., %d) intact.
+			current += string.sub(pattern, i, i + 1);
+			i += 2;
+		} else if (c === "[") {
+			inCharClass = true;
+			current += c;
+			i += 1;
+		} else if (c === "]") {
+			inCharClass = false;
+			current += c;
+			i += 1;
+		} else if (c === "|" && !inCharClass) {
+			parts.push(current);
+			current = "";
+			i += 1;
+		} else {
+			current += c;
+			i += 1;
+		}
+	}
+	parts.push(current);
+	return parts;
+}
+
+// Return the earliest match across alternatives (mirrors regex alternation).
+function findFirstPattern(line: string, alternatives: string[]): [number | undefined, number | undefined] {
+	let bestStart: number | undefined;
+	let bestEnd: number | undefined;
+	for (const alt of alternatives) {
+		if (alt === "") continue;
+		const [s, e] = string.find(line, alt);
+		if (s !== undefined && (bestStart === undefined || s < bestStart)) {
+			bestStart = s;
+			bestEnd = e as number;
+		}
+	}
+	return [bestStart, bestEnd];
+}
+
 function grepScripts(requestData: Record<string, unknown>) {
 	const pattern = requestData.pattern as string;
 	if (!pattern) return { error: "pattern is required" };
 
-	const caseSensitive = (requestData.caseSensitive as boolean) ?? false;
+	const usePattern = (requestData.usePattern as boolean) ?? false;
+	if (usePattern && requestData.caseSensitive === false) {
+		return {
+			error: "Case-insensitive Lua pattern search is not supported. Omit caseSensitive or pass caseSensitive: true with usePattern: true, or use literal search.",
+		};
+	}
+
+	const caseSensitive = usePattern ? true : ((requestData.caseSensitive as boolean) ?? false);
 	const contextLines = (requestData.contextLines as number) ?? 0;
 	const maxResults = (requestData.maxResults as number) ?? 100;
 	const maxResultsPerScript = (requestData.maxResultsPerScript as number) ?? 0;
-	const usePattern = (requestData.usePattern as boolean) ?? false;
 	const filesOnly = (requestData.filesOnly as boolean) ?? false;
 	const searchPath = (requestData.path as string) ?? "";
 	const classFilter = requestData.classFilter as string | undefined;
@@ -582,6 +645,8 @@ function grepScripts(requestData: Record<string, unknown>) {
 
 	// Prepare pattern for matching
 	const searchPattern = caseSensitive ? pattern : pattern.lower();
+	// Pre-split top-level "|" alternation once (pattern mode only).
+	const patternAlternatives = usePattern ? splitLuaAlternation(searchPattern) : undefined;
 
 	interface LineMatch {
 		line: number;
@@ -630,7 +695,7 @@ function grepScripts(requestData: Record<string, unknown>) {
 				let matchEnd: number | undefined;
 
 				if (usePattern) {
-					[matchStart, matchEnd] = string.find(searchLine, searchPattern);
+					[matchStart, matchEnd] = findFirstPattern(searchLine, patternAlternatives!);
 				} else {
 					[matchStart, matchEnd] = string.find(searchLine, searchPattern, 1, true);
 				}