Skip to content

Commit ac1335a

Browse files
Copilotzdrawku
andcommitted
refactor: improve regex readability in grader scripts per code review
Co-authored-by: zdrawku <11193764+zdrawku@users.noreply.github.com>
1 parent 23aecf0 commit ac1335a

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

  • evals/tasks

evals/tasks/grid-basic-setup/tests/test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ else
3838
fi
3939

4040
# --- Check 3: Correct import from igniteui-angular entry point ---
41+
# Accepts either the OSS or licensed package path
42+
GRID_IMPORT_PATTERN="from ['\"](@infragistics/)?igniteui-angular/grids/grid['\"]"
4143
if [ -n "$COMPONENT_FILE" ]; then
42-
if grep -qE "from ['\"]igniteui-angular/grids/grid['\"]|from ['\"]@infragistics/igniteui-angular/grids/grid['\"]" "$COMPONENT_FILE" 2>/dev/null; then
44+
if grep -qE "$GRID_IMPORT_PATTERN" "$COMPONENT_FILE" 2>/dev/null; then
4345
SCORE=$((SCORE + 1))
4446
DETAILS="${DETAILS}PASS: Correct grid entry-point import found\n"
4547
else

evals/tasks/theming-palette-generation/tests/test.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ if [ -z "${STYLES_FILE:-}" ]; then
2424
fi
2525

2626
# --- Check 1: Import from igniteui-angular/theming ---
27-
if grep -qE "@use ['\"]igniteui-angular/theming['\"]|@use ['\"]@infragistics/igniteui-angular/theming['\"]|@import ['\"]igniteui-angular/theming['\"]|@import ['\"]@infragistics/igniteui-angular/theming['\"]|@import ['\"]~igniteui-angular/lib/core/styles/themes" "$STYLES_FILE" 2>/dev/null; then
27+
# Accepts @use or @import with either the OSS or licensed package path
28+
THEMING_IMPORT_PATTERN="@(use|import) ['\"](@infragistics/)?igniteui-angular/theming['\"]"
29+
LEGACY_IMPORT_PATTERN="@import ['\"]~igniteui-angular/lib/core/styles/themes"
30+
if grep -qE "$THEMING_IMPORT_PATTERN|$LEGACY_IMPORT_PATTERN" "$STYLES_FILE" 2>/dev/null; then
2831
SCORE=$((SCORE + 1))
2932
DETAILS="${DETAILS}PASS: Correct theming import found\n"
3033
else

0 commit comments

Comments
 (0)