Skip to content

Commit 6edd884

Browse files
ifthenelseifthenelse
authored
Merge pull request #22 from ifthenelse/feature/v3_refactor
Feature/v3 refactor
2 parents 80a4460 + 9f2864c commit 6edd884

17 files changed

+112
-2747
lines changed

‎.github/workflows/validate-and-test-syntax.yml‎

Lines changed: 105 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,47 +14,124 @@ jobs:
1414
- name: Checkout repository
1515
uses: actions/checkout@v4
1616

17-
- name: Setup Python
18-
uses: actions/setup-python@v4
19-
with:
20-
python-version: "3.x"
17+
- name: Validate JSON files
18+
run: |
19+
echo "🔍 Validating JSON files..."
20+
21+
# Validate package.json
22+
if jq . package.json > /dev/null 2>&1; then
23+
echo "✅ package.json: valid JSON"
24+
else
25+
echo "❌ package.json: invalid JSON"
26+
exit 1
27+
fi
28+
29+
# Validate messages.json
30+
if jq . messages.json > /dev/null 2>&1; then
31+
echo "✅ messages.json: valid JSON"
32+
else
33+
echo "❌ messages.json: invalid JSON"
34+
exit 1
35+
fi
36+
37+
# Validate completions file
38+
if [ -f "Completions/NunjucksToolbox.sublime-completions" ]; then
39+
if jq . Completions/NunjucksToolbox.sublime-completions > /dev/null 2>&1; then
40+
echo "✅ NunjucksToolbox.sublime-completions: valid JSON"
41+
else
42+
echo "❌ NunjucksToolbox.sublime-completions: invalid JSON"
43+
exit 1
44+
fi
45+
fi
46+
47+
- name: Validate YAML files
48+
run: |
49+
echo "🔍 Validating YAML syntax files..."
2150
22-
- name: Install dependencies
23-
run: pip install PyYAML
51+
# Check if syntax files exist and have basic structure
52+
if [ -f "Syntaxes/NunjucksToolbox.sublime-syntax" ]; then
53+
if grep -q "^%YAML" Syntaxes/NunjucksToolbox.sublime-syntax; then
54+
echo "✅ NunjucksToolbox.sublime-syntax: valid YAML header"
55+
else
56+
echo "⚠️ NunjucksToolbox.sublime-syntax: missing YAML header"
57+
fi
58+
fi
2459
25-
- name: Validate YAML syntax and structure
26-
run: python3 scripts/validate_syntax.py
60+
- name: Check file structure
61+
run: |
62+
echo "🔍 Checking required files and directories..."
63+
64+
# List current directory contents for debugging
65+
echo "📁 Current directory contents:"
66+
ls -la
2767
28-
- name: Create and test with real templates
29-
run: python3 scripts/test_template_generator.py test-templates
68+
# Check required directories with more verbose output
69+
REQUIRED_DIRS=("Completions" "Keymaps" "Menu" "Settings" "Syntaxes")
70+
for dir in "${REQUIRED_DIRS[@]}"; do
71+
if [ -d "$dir" ]; then
72+
echo "✅ Directory $dir exists"
73+
else
74+
echo "❌ Directory $dir missing"
75+
ls -la "$dir" 2>/dev/null || echo " Directory not found or not accessible"
76+
exit 1
77+
fi
78+
done
3079
31-
- name: Test pattern recognition
32-
run: python3 scripts/test_patterns.py test-templates/test.njk
80+
# Check required files
81+
REQUIRED_FILES=("package.json" "messages.json")
82+
for file in "${REQUIRED_FILES[@]}"; do
83+
if [ -f "$file" ]; then
84+
echo "✅ File $file exists"
85+
else
86+
echo "❌ File $file missing"
87+
exit 1
88+
fi
89+
done
3390
34-
- name: Validate related JSON files
35-
run: python3 scripts/validate_json_files.py
91+
# Note: Commands directory exists but is intentionally empty (no Python files needed)
92+
if [ -d "Commands" ]; then
93+
echo "✅ Directory Commands exists (intentionally empty - no Python files required)"
94+
else
95+
echo "⚠️ Directory Commands missing (but not required for current architecture)"
96+
fi
97+
98+
- name: Validate scope consistency
99+
run: |
100+
echo "🔍 Checking scope consistency..."
36101
37-
- name: Check scope consistency
38-
run: python3 scripts/validate_scope_consistency.py
102+
# Check that all files use the same scope
103+
MAIN_SCOPE="text.html.nunjucks-toolbox"
104+
105+
# Check keymaps
106+
if grep -r "$MAIN_SCOPE" Keymaps/ >/dev/null 2>&1; then
107+
echo "✅ Keymaps: scope consistency verified"
108+
else
109+
echo "⚠️ Keymaps: check scope references"
110+
fi
111+
112+
# Check context menu
113+
if grep -q "$MAIN_SCOPE" Menu/Context.sublime-menu 2>/dev/null; then
114+
echo "✅ Context menu: scope consistency verified"
115+
else
116+
echo "⚠️ Context menu: check scope references"
117+
fi
39118
40119
- name: Generate test report
41120
run: |
42121
echo "# Syntax Validation Report" > test-report.md
43-
echo "- ✅ YAML syntax validation" >> test-report.md
44-
echo "- ✅ Required structure validation" >> test-report.md
45-
echo "- ✅ Pattern recognition testing" >> test-report.md
46-
echo "- ✅ JSON file validation" >> test-report.md
47-
echo "- ✅ Scope consistency check" >> test-report.md
48-
echo "- ✅ Template generation testing" >> test-report.md
122+
echo "- ✅ JSON file validation completed" >> test-report.md
123+
echo "- ✅ YAML syntax validation completed" >> test-report.md
124+
echo "- ✅ File structure validation completed" >> test-report.md
125+
echo "- ✅ Scope consistency check completed" >> test-report.md
126+
echo "- ✅ Pure configuration-based extension validated" >> test-report.md
49127
echo "" >> test-report.md
50-
echo "All validation scripts executed successfully using external modules." >> test-report.md
128+
echo "All validation checks completed successfully using built-in tools." >> test-report.md
129+
echo "Extension uses only Sublime Text configuration files (no Python scripts required)." >> test-report.md
130+
131+
echo "✅ Test report generated"
51132
52133
- name: Upload test artifacts
53134
uses: actions/upload-artifact@v4
54135
with:
55136
name: syntax-validation-report
56-
path: |
57-
test-templates/
58-
test-report.md
59-
scope-validation-report.md
60-
json-validation-report.md
137+
path: test-report.md

0 commit comments

Comments
 (0)