From 66bbfbc22f4bc00bbff02be2aab03907c99f3644 Mon Sep 17 00:00:00 2001
From: Michael Lyons <git@michael.lyo.nz>
Date: Mon, 27 Jan 2025 12:57:07 -0500
Subject: [PATCH] Fully-qualify extends path for ST4077

---
 .gitattributes                                                  | 1 -
 Excel Formula.sublime-syntax                                    | 2 +-
 Google Sheets Formula.sublime-syntax                            | 2 +-
 LibreOffice Calc Formula.sublime-syntax                         | 2 +-
 .../Excel Formula (XX).sublime-syntax                           | 2 +-
 tests/syntax_test_excel.xx.xls.txt                              | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename Excel Formula (XX).sublime-syntax => tests/Excel Formula (XX).sublime-syntax (79%)

diff --git a/.gitattributes b/.gitattributes
index 9557ded..130f0ff 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,4 +7,3 @@
 /tests/ export-ignore
 /names/ export-ignore
 /README.md export-ignore
-*(XX).sublime-syntax export-ignore
diff --git a/Excel Formula.sublime-syntax b/Excel Formula.sublime-syntax
index 58c8e9d..9b4101a 100644
--- 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
index 867ab81..45e947f 100644
--- 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
index f3c6717..a23df1b 100644
--- 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/Excel Formula (XX).sublime-syntax b/tests/Excel Formula (XX).sublime-syntax
similarity index 79%
rename from Excel Formula (XX).sublime-syntax
rename to tests/Excel Formula (XX).sublime-syntax
index c564c72..ce03d7d 100644
--- a/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
index 7ce1757..94ee169 100644
--- 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