Skip to content

Commit 4662cca

Browse files
committed
detekt Main correction for Nameshadowing.
1 parent 37dc441 commit 4662cca

File tree

1 file changed

+22
-20
lines changed

1 file changed

+22
-20
lines changed

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,9 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
264264
if (pattern.length > MAX_PATTERN_LENGTH) {
265265
return null
266266
}
267-
return pattern
268-
// Escape special regex characters except * and ?
267+
268+
// Escape special regex characters except * and ?
269+
var result = pattern
269270
.replace(".", "\\.")
270271
.replace("+", "\\+")
271272
.replace("(", "\\(")
@@ -278,28 +279,29 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
278279
.replace("^", "\\^")
279280
.replace("$", "\\$")
280281
.replace("|", "\\|")
281-
// Convert gitignore glob patterns to regex
282+
283+
// Convert gitignore glob patterns to regex
284+
result = result
282285
.replace("**", ".*?") // Match any directory depth
283286
.replace("*", "[^/]*?") // Match any character except path separator
284287
.replace("?", "[^/]") // Match single character except path separator
285-
.let { pattern ->
286-
when {
287-
// If pattern starts with '/', anchor it to the start of the path
288-
pattern.startsWith("/") -> "^${pattern.substring(1)}"
289-
// If pattern doesn't start with '/', it can match anywhere in the path
290-
else -> "(?:^|.*/?)$pattern"
291-
}
292-
}
293-
.let { pattern ->
294-
when {
295-
// If pattern ends with '/', it should match directories
296-
pattern.endsWith("/") -> "$pattern.*"
297-
// Otherwise match exactly or with a trailing slash for directories
298-
else -> "$pattern(?:/.*)?$"
299-
}
300-
}
301-
}
302288

289+
// Handle start of pattern
290+
result = if (result.startsWith("/")) {
291+
"^${result.substring(1)}"
292+
} else {
293+
"(?:^|.*/?)$result"
294+
}
295+
296+
// Handle end of pattern
297+
result = if (result.endsWith("/")) {
298+
"$result.*"
299+
} else {
300+
"$result(?:/.*)?$"
301+
}
302+
303+
return result
304+
}
303305
var selectedSourceFolder: VirtualFile
304306
set(newRoot) {
305307
_selectedSourceFolder = newRoot

0 commit comments

Comments
 (0)