Merge remote-tracking branch 'upstream/main' into ci/pkg-rename

Author: Michael Lyons

.gitattributes

@@ -5,6 +5,5 @@
 
 /.git* export-ignore
 /tests/ export-ignore
-/names/ export-ignore
+/resources/ export-ignore
 /README.md export-ignore
-*(XX).sublime-syntax export-ignore

.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

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/Spreadsheet Formula/Spreadsheet Formula (Basic).sublime-syntax
 file_extensions:
   - xls.txt
 

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/Spreadsheet Formula/Spreadsheet Formula (Basic).sublime-syntax
 file_extensions:
   - gsheet.txt
 

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/Spreadsheet Formula/Spreadsheet Formula (Basic).sublime-syntax
 file_extensions:
   - localc.txt
 

support/FunctionTranslatorDevTools.js renamed to resources/func_translator_miner.js

@@ -1,6 +1,8 @@
 // To be used with the MS Edge debugger you can open in the Function Translator add-in for Excel.
 // Starting point is to first click "References" at the top left, then click settings at the bottom right.
 
+// Sleep func to allow pages to load since I'd need to learn about async/sync
+// and event listening in JS from the ground up otherwise
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -31,7 +33,7 @@ for (let i = 1; i <= 2 /*numberOfOptions*/; i++) {
     // Get the reference table
     let thisRefTable = document.getElementById("referenceTable");
 
-    // Query all elements inside the <tbody> and filter those with a 'title' attribute, then do some 
+    // Query all elements inside the <tbody> and filter those with a `title` or `lang` attribute, then do some
     // cursed highjacking of the map function cause idc to enumerate a proper for-each.
     titlesArr = Array.from(thisRefTable.querySelectorAll("[title], [lang]")).map(
         (el) => {

Excel Formula (XX).sublime-syntax renamed to 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/Spreadsheet Formula/Excel Formula.sublime-syntax
 hidden: true
 file_extensions:
   - xx.xls.txt

tests/syntax_test_excel.xls.txt

@@ -681,7 +681,7 @@ TEXTJOIN(";",FALSE,valmax)
 '     ^^ meta.reference.cell.sheet storage.type.sheet
 ' <- keyword.operator.assignment.sheet
 
-='^'!A1
+='&'!A1
 '^^^^ meta.reference.sheet
 '^ punctuation.definition.annotation.begin.sheet
 ' ^ entity.name.struct.sheet

tests/syntax_test_excel.xx.xls.txt

@@ -1,4 +1,4 @@
-' SYNTAX TEST "Packages/Spreadsheet Formula/Excel Formula (XX).sublime-syntax"
+' SYNTAX TEST "Packages/Spreadsheet Formula/tests/Excel Formula (XX).sublime-syntax"
 
 =1
 '^ meta.number.integer.decimal.sheet constant.numeric.value.sheet

tests/syntax_test_google.gsheet.txt

@@ -702,7 +702,7 @@ TEXTJOIN(";",FALSE,valmax)
 '    ^ punctuation.separator.sequence.sheet
 '     ^^ meta.reference.cell.sheet storage.type.sheet
 
-='^'!A1
+='&'!A1
 '^^^^ meta.reference.sheet
 '^ punctuation.definition.annotation.begin.sheet
 ' ^ entity.name.struct.sheet