Merge branch 'main' of https://github.com/axemonk/Excel-formula

axemonk · axemonk · commit 13a8caa68771 · 2025-01-27T17:21:34.000-06:00
diff --git a/.gitattributes b/.gitattributes
@@ -7,4 +7,3 @@
 /tests/ export-ignore
 /resources/ export-ignore
 /README.md export-ignore
-*(XX).sublime-syntax export-ignore
diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml
@@ -35,7 +35,8 @@ jobs:
       matrix:
         include:
           - build: 'latest'
-          # - build: 3211  # libgl1-mesa-glx is not available on ubuntu-latest SublimeText/syntax-action#17
+          - build: 'stable'
+          - build: 4077  # Supported in Package Control and contains test binary
     steps:
       - uses: actions/checkout@v4
       - uses: SublimeText/syntax-test-action@v2
diff --git a/Excel Formula.sublime-syntax b/Excel Formula.sublime-syntax
@@ -3,7 +3,7 @@
 name: Excel Formula
 scope: source.sheet.excel
 version: 2
-extends: Spreadsheet Formula (Basic).sublime-syntax
+extends: Packages/Excel formula/Spreadsheet Formula (Basic).sublime-syntax
 file_extensions:
   - xls.txt
 
diff --git a/Google Sheets Formula.sublime-syntax b/Google Sheets Formula.sublime-syntax
@@ -3,7 +3,7 @@
 name: Google Sheets Formula
 scope: source.sheet.google
 version: 2
-extends: Spreadsheet Formula (Basic).sublime-syntax
+extends: Packages/Excel formula/Spreadsheet Formula (Basic).sublime-syntax
 file_extensions:
   - gsheet.txt
 
diff --git a/LibreOffice Calc Formula.sublime-syntax b/LibreOffice Calc Formula.sublime-syntax
@@ -3,7 +3,7 @@
 name: LibreOffice Calc Formula
 scope: source.sheet.libre
 version: 2
-extends: Spreadsheet Formula (Basic).sublime-syntax
+extends: Packages/Excel formula/Spreadsheet Formula (Basic).sublime-syntax
 file_extensions:
   - localc.txt
 
diff --git a/tests/Excel Formula (XX).sublime-syntax b/tests/Excel Formula (XX).sublime-syntax
@@ -3,7 +3,7 @@
 name: Excel Formula (XX)
 scope: source.sheet.excel.xx
 version: 2
-extends: Excel Formula.sublime-syntax
+extends: Packages/Excel formula/Excel Formula.sublime-syntax
 hidden: true
 file_extensions:
   - xx.xls.txt
diff --git a/tests/syntax_test_excel.xx.xls.txt b/tests/syntax_test_excel.xx.xls.txt
@@ -1,4 +1,4 @@
-' SYNTAX TEST "Packages/Excel formula/Excel Formula (XX).sublime-syntax"
+' SYNTAX TEST "Packages/Excel formula/tests/Excel Formula (XX).sublime-syntax"
 
 =1
 '^ meta.number.integer.decimal.sheet constant.numeric.value.sheet

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-' SYNTAX TEST "Packages/Excel formula/Excel Formula (XX).sublime-syntax"`
	`1`	`+' SYNTAX TEST "Packages/Excel formula/tests/Excel Formula (XX).sublime-syntax"`
`2`	`2`
`3`	`3`	`=1`
`4`	`4`	`'^ meta.number.integer.decimal.sheet constant.numeric.value.sheet`