generalize start/stop env per command

used for \ExplSyntaxOn/off

Author: sunderme

completion/latex-dev.cwl

@@ -145,8 +145,8 @@
 \EndModuleRelease#*
 \ExecuteOptions{optionlist}#*
 \ExpandArgs{spec}#*
-\ExplSyntaxOff#*
-\ExplSyntaxOn#*
+\ExplSyntaxOff#endEnv*#expl3
+\ExplSyntaxOn#beginEnv*#expl3
 \FirstMark[region]{class%plain}#*
 \FirstMark{class%plain}#*
 \GenericError{continuation}{message%text}{help location%text}{help info%text}#*
@@ -383,9 +383,9 @@ ypos
 # expl3 commands
 \ExplFileDate#S
 \ExplLoaderFileDate#*
-\ProvidesExplFile{name}{date}{version}{description}#*
-\ProvidesExplClass{name}{date}{version}{description}#*
-\ProvidesExplPackage{name}{date}{version}{description}#*
+\ProvidesExplFile{name}{date}{version}{description}#beginEnv*#expl3
+\ProvidesExplClass{name}{date}{version}{description}#beginEnv*#expl3
+\ProvidesExplPackage{name}{date}{version}{description}#beginEnv*#expl3
 \GetIdInfo $Id: %<SVN info field%> $ {%<description%>}#*
 
 # document metadata

src/latexpackage.cpp

@@ -219,6 +219,16 @@ LatexPackage loadCwlFile(const QString fileName, LatexCompleterConfig *config, Q
 
 				// get commandDefinition
 				CommandDescription cd = extractCommandDef(line, valid);
+                if(valid.startsWith("beginEnv")){
+                    package.possibleCommands["%beginEnv"]<<line;
+                    package.environmentAliases.insert(line, definition);
+                    valid=valid.mid(8); // maintain additional classifiers
+                }
+                if(valid.startsWith("endEnv")){
+                    package.possibleCommands["%endEnv"]<<line;
+                    package.environmentAliases.insert(line, definition);
+                    valid=valid.mid(6); // maintain additional classifiers
+                }
 				if(valid.contains('K')){
 					// bracket command like \left etc
 					cd.bracketCommand=true;

src/syntaxcheck.cpp

@@ -578,14 +578,21 @@ void SyntaxCheck::checkLine(const QString &line, Ranges &newRanges, StackEnviron
         if(!activeEnv.isEmpty() && activeEnv.top().endingColumn>=0 && tk.start>activeEnv.top().endingColumn){
             Environment env=activeEnv.pop();
         }
+        // handle single command env stop e.g. \ExplSyntaxOff
+        if(tk.type==Token::command){
+            const QString word=tk.getText();
+            if(ltxCommands->possibleCommands["%endEnv"].contains(word)){
+                const QString envName=ltxCommands->environmentAliases.value(word);
+                if(activeEnv.top().name == envName){
+                    activeEnv.pop();
+                    continue;
+                }
+            }
+        }
+
         // special treatment for ExplSyntaxOff
         // it is used to toggle expl3 mode off
         if(!activeEnv.isEmpty() && activeEnv.top().name == "expl3"){
-            const QString word=tk.getText();
-            if( word == "\\ExplSyntaxOff"){
-                activeEnv.pop();
-                continue;
-            }
             if(tk.type==Token::commandUnknown || tk.type==Token::command){
                 // collect next parts
                 // e.g. \cs_new:Npn is split into \cs _ new : Npn
@@ -1042,9 +1049,10 @@ void SyntaxCheck::checkLine(const QString &line, Ranges &newRanges, StackEnviron
             // special treatment for \ExplSyntaxOn, \ExplSyntaxOff
             // \ProvidesExplPackage, \ProvidesExplClass and \ProvidesExplFile
             // activate latex3 mode which ignores _ in commandnames
-            if(word=="\\ExplSyntaxOn" || word=="\\ProvidesExplPackage" || word=="\\ProvidesExplClass" || word=="\\ProvidesExplFile"){
+            if(ltxCommands->possibleCommands["%beginEnv"].contains(word)){
+                const QString envName=ltxCommands->environmentAliases.value(word);
                 Environment env;
-                env.name = "expl3";
+                env.name = envName;
                 env.id = 1; // to be changed
                 env.dlh = dlh;
                 env.ticket = ticket;