Quick update to lumina-textedit:

1. Add a new syntax highlighting "meta" option for auto-selecting a ruleset based on the first line of text in the file, and add rules for shell, json, and python to support first-line matches.
2. Fix up the detection of "read-only" property on newly-saved files.

7 files changed, 45 insertions, 8 deletions

diff --git a/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp b/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp
index 8626b2b4..b1592cc3 100644
--- a/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp
+++ b/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp
@@ -76,17 +76,22 @@ void PlainTextEditor::LoadFile(QString filepath){
   bool diffFile = (filepath != this->whatsThis());
   this->setWhatsThis(filepath);
   this->clear();
-  QList<SyntaxFile> files = SyntaxFile::availableFiles(settings);
+  /*QList<SyntaxFile> files = SyntaxFile::availableFiles(settings);
   for(int i=0; i<files.length(); i++){
     if(files[i].supportsFile(filepath) ){
       files[i].SetupDocument(this);
       SYNTAX->loadRules(files[i]);
       break;
     }
-  }
+  }*/
   //SYNTAX->loadRules( Custom_Syntax::ruleForFile(filepath.section("/",-1), settings) );
   lastSaveContents = LUtils::readFile(filepath).join("\n");
   if(diffFile){
+    SYNTAX->loadRules( Custom_Syntax::ruleForFile(this->whatsThis().section("/",-1), settings) );
+    if(SYNTAX->loadedRules().isEmpty()){
+      SYNTAX->loadRules( Custom_Syntax::ruleForFirstLine( lastSaveContents.section("\n",0,0,QString::SectionSkipEmpty) , settings) );
+    }
+    SYNTAX->setupDocument(this);
     this->setPlainText( lastSaveContents );
   }else{
     //Try to keep the mouse cursor/scroll in the same position
@@ -123,14 +128,18 @@ bool PlainTextEditor::SaveFile(bool newname){
     if(file.isEmpty()){ return false; } //cancelled
     this->setWhatsThis(file);
     SYNTAX->loadRules( Custom_Syntax::ruleForFile(this->whatsThis().section("/",-1), settings) );
+    if(SYNTAX->loadedRules().isEmpty()){
+      SYNTAX->loadRules( Custom_Syntax::ruleForFirstLine( this->toPlainText().section("\n",0,0,QString::SectionSkipEmpty) , settings) );
+    }
+    SYNTAX->setupDocument(this);
     SYNTAX->rehighlight();
-    readonly = !QFileInfo(this->whatsThis()).isWritable(); //update this flag
   }
   if( !watcher->files().isEmpty() ){ watcher->removePaths(watcher->files()); }
   bool ok = LUtils::writeFile(this->whatsThis(), this->toPlainText().split("\n"), true);
   hasChanges = !ok;
   if(ok){ lastSaveContents = this->toPlainText(); emit FileLoaded(this->whatsThis()); }
   watcher->addPath(currentFile());
+  readonly = !QFileInfo(this->whatsThis()).isWritable(); //update this flag
   return true;
   //qDebug() << " - Success:" << ok << hasChanges;
 }
diff --git a/src-qt5/desktop-utils/lumina-textedit/syntaxSupport.cpp b/src-qt5/desktop-utils/lumina-textedit/syntaxSupport.cpp
index 53f51f4e..a80d4149 100644
--- a/src-qt5/desktop-utils/lumina-textedit/syntaxSupport.cpp
+++ b/src-qt5/desktop-utils/lumina-textedit/syntaxSupport.cpp
@@ -83,6 +83,16 @@ bool SyntaxFile::supportsFile(QString file){
   return false;
 }
 
+bool SyntaxFile::supportsFirstLine(QString line){
+  line = line.simplified();
+  if(metaObj.contains("first_line_match")){
+    return metaObj.value("first_line_match").toArray().contains(line);
+  }else if(metaObj.contains("first_line_regex")){
+    return (QRegExp( metaObj.value("first_line_regex").toString() ).indexIn(line) >=0 );
+  }
+  return false;
+}
+
 bool SyntaxFile::LoadFile(QString file, QSettings *settings){
   QStringList contents = LUtils::readFile(file);
   //Now trim the extra non-JSON off the beginning of the file
@@ -209,6 +219,13 @@ QString Custom_Syntax::ruleForFile(QString filename, QSettings *settings){
   return "";
 }
 
+QString Custom_Syntax::ruleForFirstLine(QString line, QSettings *settings){
+  QList<SyntaxFile> files = SyntaxFile::availableFiles(settings);
+  for(int i=0; i<files.length(); i++){
+    if(files[i].supportsFirstLine(line)){ return files[i].name(); }
+  }
+  return "";
+}
 
 void Custom_Syntax::loadRules(QString type){
   QList<SyntaxFile> files = SyntaxFile::availableFiles(settings);
diff --git a/src-qt5/desktop-utils/lumina-textedit/syntaxSupport.h b/src-qt5/desktop-utils/lumina-textedit/syntaxSupport.h
index bffbfd1a..9949a90c 100644
--- a/src-qt5/desktop-utils/lumina-textedit/syntaxSupport.h
+++ b/src-qt5/desktop-utils/lumina-textedit/syntaxSupport.h
@@ -46,6 +46,7 @@ public:
 
 	void SetupDocument(QPlainTextEdit *editor);
 	bool supportsFile(QString file); //does this syntax set support the file?
+	bool supportsFirstLine(QString line); //is the type of file defined by the first line of the file? ("#!/bin/<something>" for instance)
 
 	//Main Loading routine (run this before other functions)
 	bool LoadFile(QString file, QSettings *settings);
@@ -66,10 +67,13 @@ public:
 	}
 	~Custom_Syntax(){}
 
+	QString loadedRules(){ return syntax.name(); }
+
 	static QStringList availableRules(QSettings *settings);
 	static QStringList knownColors();
 	static void SetupDefaultColors(QSettings *settings);
 	static QString ruleForFile(QString filename, QSettings *settings);
+	static QString ruleForFirstLine(QString line, QSettings *settings);
 	void loadRules(QString type);
 	void loadRules(SyntaxFile sfile);
 
@@ -77,6 +81,8 @@ public:
 	  loadRules( syntax.name() );
 	}
 
+	void setupDocument(QPlainTextEdit *edit){ syntax.SetupDocument(edit); } //simple redirect for the function in the currently-loaded rules
+
 protected:
 	void highlightBlock(const QString &text){
           //qDebug() << "Highlight Block:" << text;
@@ -159,7 +165,7 @@ protected:
 	    int last = text.length()-1;
             while(last>=0 && (text[last]==' ' || text[last]=='\t' ) ){ last--; }
 	    if(last < text.length()-1){
-	      setFormat(last+1, text.length()-1-last, fmt);	      
+	      setFormat(last+1, text.length()-1-last, fmt);
 	    }
           }
 	}
diff --git a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/README.md b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/README.md
index fa00b557..04190672 100644
--- a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/README.md
+++ b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/README.md
@@ -9,9 +9,11 @@ A small comment section may be placed at the top of the file where every line st
 # Requirements
 1. A "meta" object containing the following variables (meta information about the rules):
    1. "name" : The name that will be shown to the user for this set of syntax rules.
-   2. If this syntax file is to be automatically applied to particular file type, then one of the following options must be set:
+   2. If this syntax file is to be automatically applied to particular file type, then at least one of the following options must be set:
       1. "file_suffix" : An array of file extensions which are supported by this syntax rule set (Example: temp.foo will be matched by "file_suffix"=["foo"] )
       2. "file_regex" : A regular expression which should be used to find if the filename matches this rule set.
+      3. "first_line_match" : *(only used if no filename rules matched)* Exact match for the first line of text in the file (Example: "#!/bin/sh")
+      4. "first_line_regex" : *(only used if no filename rules matched)* Regular expression to use when find a match for the first line of text in the file
 2. A "format" object containing the following variables (file-wide formatting):
    1. "columns_per_line" : (integer, optional) For file formats with line-length restrictions, this will automatically highlight/flag any "overage" of the designated limit.
    2. "highlight_whitespace_eol" : (boolian, optional) Highlight any excess whitespace at the end of a line.
diff --git a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/json.syntax b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/json.syntax
index ab67d384..1982e599 100644
--- a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/json.syntax
+++ b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/json.syntax
@@ -8,7 +8,8 @@
 {
 	"meta": {
 		"name": "JSON",
-		"file_suffix": ["json", "syntax"]
+		"file_suffix": ["json", "syntax"],
+		"first_line_match":["{"]
 	},
 	"format": {
 		"line_wrap": false,
diff --git a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/python.syntax b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/python.syntax
index 6690d98c..2145beec 100644
--- a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/python.syntax
+++ b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/python.syntax
@@ -8,7 +8,8 @@
 {
 	"meta": {
 		"name": "Python",
-		"file_suffix": ["py", "pyc"]
+		"file_suffix": ["py", "pyc"],
+		"first_line_regex" : "(#!).+(python)"
 	},
 	"format": {
 		"line_wrap": false,
diff --git a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/sh.syntax b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/sh.syntax
index 5f38cadc..f2256731 100644
--- a/src-qt5/desktop-utils/lumina-textedit/syntax_rules/sh.syntax
+++ b/src-qt5/desktop-utils/lumina-textedit/syntax_rules/sh.syntax
@@ -8,7 +8,8 @@
 {
 	"meta": {
 		"name": "Shell",
-		"file_suffix": ["sh"]
+		"file_suffix": ["sh"],
+		"first_line_match":["#!/bin/sh", "#!/sbin/openrc-run"]
 	},
 	"format": {
 		"line_wrap": false,