Mercurial > hg > forks > UniversalIndentGUI

changeset 654:68b44fb0c0ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made it possible to define "stdin" to be used for an indenter calling. Also encoded the messages to be shown in an error message box as HTML so that < > and & will be displayed correctly. And from now on no longer merging stdout and stderr so that outputs to stderr will no longer make it into the to stdout returned formatted code. git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@914 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Fri, 06 Feb 2009 14:11:25 +0000
parents edf5f567ba17
children 36c10a09ad84
files src/IndentHandler.cpp src/IndentHandler.h
diffstat 2 files changed, 64 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/src/IndentHandler.cpp	Wed Feb 04 16:52:14 2009 +0000
+++ b/src/IndentHandler.cpp	Fri Feb 06 14:11:25 2009 +0000
@@ -403,8 +403,21 @@
     // Delete any previously used input src file and create a new input src file.
     QFile::remove(tempDirctoryStr + "/" + inputFileName + inputFileExtension);
     QFile inputSrcFile(tempDirctoryStr + "/" + inputFileName + inputFileExtension);
-    parameterInputFile = " " + inputFileParameter + inputFileName + inputFileExtension;
+    // Write the source code to the input file for the indenter
+    inputSrcFile.open( QFile::ReadWrite | QFile::Text );
+    inputSrcFile.write( sourceCode.toUtf8() );
+    inputSrcFile.close();
 
+    // Set the input file for the to be called indenter.
+    if ( inputFileParameter.trimmed() == "<" || inputFileParameter == "stdin" ) {
+        parameterInputFile = "";
+        indentProcess.setStandardInputFile( inputSrcFile.fileName() );
+    }
+    else {
+        parameterInputFile = " " + inputFileParameter + inputFileName + inputFileExtension;
+    }
+
+    // Set the output file for the to be called indenter.
     if ( outputFileParameter != "none" && outputFileParameter != "stdout" ) {
         parameterOuputFile = " " + outputFileParameter + outputFileName + inputFileExtension;
     }
@@ -442,13 +455,8 @@
     // Generate the indenter call string either for win32 or other systems.
     indenterCompleteCallString = indenterExecutableCallString + indenterCompleteCallString;
 
-    // Write the source code to the input file for the indenter
-    inputSrcFile.open( QFile::ReadWrite | QFile::Text );
-    inputSrcFile.write( sourceCode.toUtf8() );
-    inputSrcFile.close();
-
     // errors and standard outputs from the process call are merged together
-    indentProcess.setReadChannelMode(QProcess::MergedChannels);
+    //indentProcess.setReadChannelMode(QProcess::MergedChannels);
 
     // Set the directory for the indenter execution
     indentProcess.setWorkingDirectory( QFileInfo(tempDirctoryStr).absoluteFilePath() );
@@ -456,8 +464,9 @@
     indentProcess.start(indenterCompleteCallString);
 
     processReturnString = "";
+    bool calledProcessSuccessfully = indentProcess.waitForFinished(10000);
     // test if there was an error during starting the process of the indenter
-    if ( !indentProcess.waitForFinished(10000) ) {
+    if ( !calledProcessSuccessfully ) {
         processReturnString = "<html><body>";
         processReturnString += tr("<b>Returned error message:</b> ") + indentProcess.errorString() + "<br>";
 
@@ -483,39 +492,47 @@
             default:
                 break;
         }
-        processReturnString += tr("<br><b>Callstring was:</b> ") + indenterCompleteCallString;
-        processReturnString += tr("<br><br><b>Indenter output was:</b><pre>") + indentProcess.readAll() + "</pre></html></body>";
+        processReturnString += tr("<br><b>Callstring was:</b> ") + encodeToHTML(indenterCompleteCallString);
+        processReturnString += tr("<br><br><b>Indenter output was:</b><pre>") + "<br>" +
+                               "(STDOUT):" + encodeToHTML( indentProcess.readAllStandardOutput() ) + "<br>" +
+                               "(STDERR):" + encodeToHTML( indentProcess.readAllStandardError() ) + "<br>" +
+                               "</pre></html></body>";
         QApplication::restoreOverrideCursor();
         errorMessageDialog->showMessage(tr("Error calling Indenter"), processReturnString);
     }
-    // there was no problem starting the process/indenter so fetch, what it returned
-    else {
-        processReturnString += indentProcess.readAll();
-    }
 
-    // if the indenter returned an errorcode != 0 show its output
+    // If the indenter returned an error code != 0 show its output.
     if ( indentProcess.exitCode() != 0 ) {
         QString exitCode;
         exitCode.setNum(indentProcess.exitCode());
         processReturnString = tr("<b>Indenter returned with exit code:</b> ") + exitCode + "<br>" +
-                              tr("<b>Indent console output was:</b> ") + processReturnString + "<br>" +
-                              tr("<br><b>Callstring was:</b> ") + indenterCompleteCallString + "</html></body>";
+                              tr("<b>Indent console output was:</b> ") + "<br>" +
+                              "(STDOUT):" + encodeToHTML( indentProcess.readAllStandardOutput() ) + "<br>" +
+                              "(STDERR):" + encodeToHTML( indentProcess.readAllStandardError() ) + "<br>" +
+                              tr("<br><b>Callstring was:</b> ") + encodeToHTML(indenterCompleteCallString) + 
+                              "</html></body>";
         QApplication::restoreOverrideCursor();
         errorMessageDialog->showMessage( tr("Indenter returned error"), processReturnString );
     }
 
-    // If the indenter results are written to stdout, read them from there...
-    if ( indentProcess.exitCode() == 0 && outputFileParameter == "stdout"  ) {
-        formattedSourceCode = processReturnString;
+    // Only get the formatted source code, if calling the indenter did succeed.
+    if ( calledProcessSuccessfully ) {
+        // If the indenter results are written to stdout, read them from there...
+        if ( indentProcess.exitCode() == 0 && outputFileParameter == "stdout"  ) {
+            formattedSourceCode = indentProcess.readAllStandardOutput();
+        }
+        // ... else read the output file generated by the indenter call.
+        else {
+            QFile outSrcFile(tempDirctoryStr + "/" + outputFileName + inputFileExtension);
+            outSrcFile.open(QFile::ReadOnly | QFile::Text);
+            QTextStream outSrcStrm(&outSrcFile);
+            outSrcStrm.setCodec( QTextCodec::codecForName("UTF-8") );
+            formattedSourceCode = outSrcStrm.readAll();
+            outSrcFile.close();
+        }
     }
-    // ... else read the output file generated by the indenter call.
     else {
-        QFile outSrcFile(tempDirctoryStr + "/" + outputFileName + inputFileExtension);
-        outSrcFile.open(QFile::ReadOnly | QFile::Text);
-        QTextStream outSrcStrm(&outSrcFile);
-        outSrcStrm.setCodec( QTextCodec::codecForName("UTF-8") );
-        formattedSourceCode = outSrcStrm.readAll();
-        outSrcFile.close();
+        return sourceCode;
     }
 
     // Delete the temporary input and output files.
@@ -1598,3 +1615,21 @@
     updateDrawing();
 #endif // UNIVERSALINDENTGUI_NPP_EXPORTS
 }
+
+
+/*!
+    \brief Converts characters < > and & in the \a text to HTML codes &lt &gt and &amp.
+ */
+QString IndentHandler::encodeToHTML(const QString &text) {
+    QString htmlText = text;
+    htmlText.replace("&", "&amp;");
+    htmlText.replace("<", "&lt;");
+    htmlText.replace(">", "&gt;");
+    htmlText.replace('"', "&quot;");
+    htmlText.replace("'", "&#39;");
+    htmlText.replace("^", "&circ;");
+    htmlText.replace("~", "&tilde;");
+    htmlText.replace("€", "&euro;");
+    htmlText.replace("©", "&copy;");
+    return htmlText;
+}
--- a/src/IndentHandler.h	Wed Feb 04 16:52:14 2009 +0000
+++ b/src/IndentHandler.h	Fri Feb 06 14:11:25 2009 +0000
@@ -189,6 +189,8 @@
     QAction *actionResetIndenterParameters;
     void(*parameterChangedCallback)(void);
     void(*windowClosedCallback)(void);
+
+    QString encodeToHTML(const QString &text);
 };
 
 #endif // INDENTHANDLER_H