implement #3878

special treatment for tcolorbox definitions
They defines commands which automatically have +1 mandatory arguments
These commands are marked in cwl with the classifier "d1"

Author: sunderme

completion/tcolorbox.cwl

@@ -159,22 +159,22 @@ library/all
 \RenewTotalTColorBox[init options]{cmd}{xargs}{options%keyvals}{content}
 \ProvideTotalTColorBox{cmd}{xargs}{options%keyvals}{content}#d
 \ProvideTotalTColorBox[init options]{cmd}{xargs}{options%keyvals}{content}#d
-\newtcbox{cmd}{options%keyvals}#d
-\newtcbox{cmd}[args]{options%keyvals}#d
-\newtcbox{cmd}[args][default]{options%keyvals}#d
-\newtcbox[init options]{cmd}{options%keyvals}#d
-\newtcbox[init options]{cmd}[args]{options%keyvals}#*d
-\newtcbox[init options]{cmd}[args][default]{options%keyvals}#*d
+\newtcbox{cmd}{options%keyvals}#d1
+\newtcbox{cmd}[args]{options%keyvals}#d1
+\newtcbox{cmd}[args][default]{options%keyvals}#d1
+\newtcbox[init options]{cmd}{options%keyvals}#d1
+\newtcbox[init options]{cmd}[args]{options%keyvals}#*d1
+\newtcbox[init options]{cmd}[args][default]{options%keyvals}#*d1
 \renewtcbox{cmd}{options%keyvals}
 \renewtcbox{cmd}[args]{options%keyvals}
 \renewtcbox{cmd}[args][default]{options%keyvals}
 \renewtcbox[init options]{cmd}{options%keyvals}
 \renewtcbox[init options]{cmd}[args]{options%keyvals}#*
 \renewtcbox[init options]{cmd}[args][default]{options%keyvals}#*
-\DeclareTCBox{cmd}{xargs}{options%keyvals}#d
-\DeclareTCBox[init options]{cmd}{xargs}{options%keyvals}#d
-\NewTCBox{cmd}{xargs}{options%keyvals}#d
-\NewTCBox[init options]{cmd}{xargs}{options%keyvals}#d
+\DeclareTCBox{cmd}{xargs}{options%keyvals}#d1
+\DeclareTCBox[init options]{cmd}{xargs}{options%keyvals}#d1
+\NewTCBox{cmd}{xargs}{options%keyvals}#d1
+\NewTCBox[init options]{cmd}{xargs}{options%keyvals}#d1
 \RenewTCBox{cmd}{xargs}{options%keyvals}
 \RenewTCBox[init options]{cmd}{xargs}{options%keyvals}
 \ProvideTCBox{cmd}{xargs}{options%keyvals}#d

src/latexdocument.cpp

@@ -793,12 +793,18 @@ void LatexDocument::interpretCommandArguments(QDocumentLineHandle *dlh, const in
             QString xarg=Parsing::getArg(args, Token::defXparseArg);
             if(!xarg.isEmpty()){
                 // xparse style defintion
+                if(lp->possibleCommands["%definition1"].contains(cmd)||ltxCommands.possibleCommands["%definition1"].contains(cmd)){
+                    xarg+="m"; // special treatment for newtcbox and similar. Automatically add one mandatory argument
+                }
                 QString arguments=interpretXArgs(xarg);
                 cmdName=cmdName+arguments;
             }else{
                 int optionCount = Parsing::getArg(args, Token::defArgNumber).toInt(); // results in 0 if there is no optional argument or conversion fails
                 if (optionCount > 9 || optionCount < 0) optionCount = 0; // limit number of options
                 def = !Parsing::getArg(args, Token::optionalArgDefinition).isEmpty();
+                if(lp->possibleCommands["%definition1"].contains(cmd)||ltxCommands.possibleCommands["%definition1"].contains(cmd)){
+                    ++optionCount; // special treatment for newtcbox and similar. Automatically add one mandatory argument
+                }
 
 
                 for (int j = 0; j < optionCount; j++) {

src/latexpackage.cpp

@@ -284,6 +284,13 @@ LatexPackage loadCwlFile(const QString fileName, LatexCompleterConfig *config, Q
                 if (keywords.contains(rxComMatch2.captured(2))) {
                     package.optionCommands << rxComMatch2.captured(1);
 				}
+                if (valid.contains("d1")) { // definition command for newtcbox and similar. It automatically will add an extra mandatory argument for the completer
+                    if (res > -1) {
+                        package.possibleCommands["%definition"] << rxComMatch.captured(1);
+                        package.possibleCommands["%definition1"] << rxComMatch.captured(1);
+                    }
+                    valid.remove("d1");
+                }
 				if (valid.contains('d')) { // definition command
 					if (res > -1) {
                         package.possibleCommands["%definition"] << rxComMatch.captured(1);