1) Fixed issue #347: Syntax highlight doesn't like apostrophe in heredoc.

[phpeclipse.git] / net.sourceforge.phpeclipse.externaltools / src / net / sourceforge / phpdt / externaltools / actions / ExternalPHPParser.java

diff --git a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java
index ffb9ca7..f5f9fdb 100644 (file)
--- a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java
+++ b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java
@@ -54,7 +54,7 @@ public class ExternalPHPParser {
                // final IPath path = file.getFullPath();
                final IPreferenceStore store = ExternalToolsPlugin.getDefault()
                                .getPreferenceStore();
-               final String filename = fFileToParse.getLocation().toString();
+               final String filename = fFileToParse.getFullPath().toString();
 
                final String[] arguments = { filename };
                final MessageFormat form = new MessageFormat(store
@@ -164,34 +164,34 @@ public class ExternalPHPParser {
         * @throws CoreException
         *             an exception throwed by the MarkerUtilities
         */
-       private void setMarker(final IFile file, final String message,
-                       final int charStart, final int charEnd, final int errorLevel)
-                       throws CoreException {
-               if (file != null) {
-                       final Hashtable attributes = new Hashtable();
-                       MarkerUtilities.setMessage(attributes, message);
-                       switch (errorLevel) {
-                       case ERROR:
-                               attributes.put(IMarker.SEVERITY, new Integer(
-                                               IMarker.SEVERITY_ERROR));
-                               break;
-                       case WARNING:
-                               attributes.put(IMarker.SEVERITY, new Integer(
-                                               IMarker.SEVERITY_WARNING));
-                               break;
-                       case INFO:
-                               attributes.put(IMarker.SEVERITY, new Integer(
-                                               IMarker.SEVERITY_INFO));
-                               break;
-                       case TASK:
-                               attributes.put(IMarker.SEVERITY, new Integer(IMarker.TASK));
-                               break;
-                       }
-                       MarkerUtilities.setCharStart(attributes, charStart);
-                       MarkerUtilities.setCharEnd(attributes, charEnd);
-                       MarkerUtilities.createMarker(file, attributes, PROBLEM_ID);
-               }
-       }
+//     private void setMarker(final IFile file, final String message,
+//                     final int charStart, final int charEnd, final int errorLevel)
+//                     throws CoreException {
+//             if (file != null) {
+//                     final Hashtable attributes = new Hashtable();
+//                     MarkerUtilities.setMessage(attributes, message);
+//                     switch (errorLevel) {
+//                     case ERROR:
+//                             attributes.put(IMarker.SEVERITY, new Integer(
+//                                             IMarker.SEVERITY_ERROR));
+//                             break;
+//                     case WARNING:
+//                             attributes.put(IMarker.SEVERITY, new Integer(
+//                                             IMarker.SEVERITY_WARNING));
+//                             break;
+//                     case INFO:
+//                             attributes.put(IMarker.SEVERITY, new Integer(
+//                                             IMarker.SEVERITY_INFO));
+//                             break;
+//                     case TASK:
+//                             attributes.put(IMarker.SEVERITY, new Integer(IMarker.TASK));
+//                             break;
+//                     }
+//                     MarkerUtilities.setCharStart(attributes, charStart);
+//                     MarkerUtilities.setCharEnd(attributes, charEnd);
+//                     MarkerUtilities.createMarker(file, attributes, PROBLEM_ID);
+//             }
+//     }
 
        /**
         * This will set a marker.
@@ -207,37 +207,37 @@ public class ExternalPHPParser {
         * @throws CoreException
         *             an exception throwed by the MarkerUtilities
         */
-       private void setMarker(final IFile file, final String message,
-                       final int line, final int errorLevel, final String location)
-                       throws CoreException {
-               if (file != null) {
-                       String markerKind = PROBLEM_ID;
-                       final Hashtable attributes = new Hashtable();
-                       MarkerUtilities.setMessage(attributes, message);
-                       switch (errorLevel) {
-                       case ERROR:
-                               attributes.put(IMarker.SEVERITY, new Integer(
-                                               IMarker.SEVERITY_ERROR));
-                               break;
-                       case WARNING:
-                               attributes.put(IMarker.SEVERITY, new Integer(
-                                               IMarker.SEVERITY_WARNING));
-                               break;
-                       case INFO:
-                               attributes.put(IMarker.SEVERITY, new Integer(
-                                               IMarker.SEVERITY_INFO));
-                               break;
-                       case TASK:
-                               attributes.put(IMarker.SEVERITY, new Integer(
-                                               IMarker.SEVERITY_INFO));
-                               markerKind = IMarker.TASK;
-                               break;
-                       }
-                       attributes.put(IMarker.LOCATION, location);
-                       MarkerUtilities.setLineNumber(attributes, line);
-                       MarkerUtilities.createMarker(file, attributes, markerKind);
-               }
-       }
+//     private void setMarker(final IFile file, final String message,
+//                     final int line, final int errorLevel, final String location)
+//                     throws CoreException {
+//             if (file != null) {
+//                     String markerKind = PROBLEM_ID;
+//                     final Hashtable attributes = new Hashtable();
+//                     MarkerUtilities.setMessage(attributes, message);
+//                     switch (errorLevel) {
+//                     case ERROR:
+//                             attributes.put(IMarker.SEVERITY, new Integer(
+//                                             IMarker.SEVERITY_ERROR));
+//                             break;
+//                     case WARNING:
+//                             attributes.put(IMarker.SEVERITY, new Integer(
+//                                             IMarker.SEVERITY_WARNING));
+//                             break;
+//                     case INFO:
+//                             attributes.put(IMarker.SEVERITY, new Integer(
+//                                             IMarker.SEVERITY_INFO));
+//                             break;
+//                     case TASK:
+//                             attributes.put(IMarker.SEVERITY, new Integer(
+//                                             IMarker.SEVERITY_INFO));
+//                             markerKind = IMarker.TASK;
+//                             break;
+//                     }
+//                     attributes.put(IMarker.LOCATION, location);
+//                     MarkerUtilities.setLineNumber(attributes, line);
+//                     MarkerUtilities.createMarker(file, attributes, markerKind);
+//             }
+//     }
 
        /**
         * This will set a marker.
@@ -253,14 +253,14 @@ public class ExternalPHPParser {
         * @throws CoreException
         *             an exception throwed by the MarkerUtilities
         */
-       private void setMarker(final String message, final int charStart,
-                       final int charEnd, final int errorLevel, final String location)
-                       throws CoreException {
-               if (fFileToParse != null) {
-                       setMarker(fFileToParse, message, charStart, charEnd, errorLevel,
-                                       location);
-               }
-       }
+//     private void setMarker(final String message, final int charStart,
+//                     final int charEnd, final int errorLevel, final String location)
+//                     throws CoreException {
+//             if (fFileToParse != null) {
+//                     setMarker(fFileToParse, message, charStart, charEnd, errorLevel,
+//                                     location);
+//             }
+//     }
 
        /**
         * This will set a marker.
@@ -280,35 +280,35 @@ public class ExternalPHPParser {
         * @throws CoreException
         *             an exception throwed by the MarkerUtilities
         */
-       private void setMarker(final IFile file, final String message,
-                       final int charStart, final int charEnd, final int errorLevel,
-                       final String location) throws CoreException {
-               if (file != null) {
-                       final Hashtable attributes = new Hashtable();
-                       MarkerUtilities.setMessage(attributes, message);
-                       switch (errorLevel) {
-                       case ERROR:
-                               attributes.put(IMarker.SEVERITY, new Integer(
-                                               IMarker.SEVERITY_ERROR));
-                               break;
-                       case WARNING:
-                               attributes.put(IMarker.SEVERITY, new Integer(
-                                               IMarker.SEVERITY_WARNING));
-                               break;
-                       case INFO:
-                               attributes.put(IMarker.SEVERITY, new Integer(
-                                               IMarker.SEVERITY_INFO));
-                               break;
-                       case TASK:
-                               attributes.put(IMarker.SEVERITY, new Integer(IMarker.TASK));
-                               break;
-                       }
-                       attributes.put(IMarker.LOCATION, location);
-                       MarkerUtilities.setCharStart(attributes, charStart);
-                       MarkerUtilities.setCharEnd(attributes, charEnd);
-                       MarkerUtilities.createMarker(file, attributes, PROBLEM_ID); // IMarker.PROBLEM);
-               }
-       }
+//     private void setMarker(final IFile file, final String message,
+//                     final int charStart, final int charEnd, final int errorLevel,
+//                     final String location) throws CoreException {
+//             if (file != null) {
+//                     final Hashtable attributes = new Hashtable();
+//                     MarkerUtilities.setMessage(attributes, message);
+//                     switch (errorLevel) {
+//                     case ERROR:
+//                             attributes.put(IMarker.SEVERITY, new Integer(
+//                                             IMarker.SEVERITY_ERROR));
+//                             break;
+//                     case WARNING:
+//                             attributes.put(IMarker.SEVERITY, new Integer(
+//                                             IMarker.SEVERITY_WARNING));
+//                             break;
+//                     case INFO:
+//                             attributes.put(IMarker.SEVERITY, new Integer(
+//                                             IMarker.SEVERITY_INFO));
+//                             break;
+//                     case TASK:
+//                             attributes.put(IMarker.SEVERITY, new Integer(IMarker.TASK));
+//                             break;
+//                     }
+//                     attributes.put(IMarker.LOCATION, location);
+//                     MarkerUtilities.setCharStart(attributes, charStart);
+//                     MarkerUtilities.setCharEnd(attributes, charEnd);
+//                     MarkerUtilities.createMarker(file, attributes, PROBLEM_ID); // IMarker.PROBLEM);
+//             }
+//     }
 
        private String getParserOutput(String command, String consoleMessage) {
                try {