X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java index dd34221..3d78be7 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java @@ -12,39 +12,34 @@ Contributors: Klaus Hartlage - www.eclipseproject.de **********************************************************************/ +import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; -import java.util.Collections; -import java.util.Hashtable; import java.util.List; +import net.sourceforge.phpdt.internal.compiler.util.Util; +import net.sourceforge.phpeclipse.PHPeclipsePlugin; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.Position; +import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.ui.texteditor.MarkerUtilities; import org.eclipse.ui.texteditor.TextEditorAction; +import test.PHPParserManager; +import test.PHPParserSuperclass; + /** - * Class that defines the action for parsing the current PHP file + * ClassDeclaration that defines the action for parsing the current PHP file */ public class PHPParserAction extends TextEditorAction { - // public static final String EXE = "exe"; //$NON-NLS-1$ - // public static final String WINEXE = "winexe"; //$NON-NLS-1$ - // public static final String LIBRARY = "library"; //$NON-NLS-1$ - // public static final String MODULE = "module"; //$NON-NLS-1$ - - // private static final String ERROR = "error"; //$NON-NLS-1$ - // private static final String WARNING = "warning"; //$NON-NLS-1$ - private static PHPParserAction instance = new PHPParserAction(); + private static String[] EXTENSIONS = { ".php", ".php3", ".php4", ".inc", ".phtml" }; protected IFile fileToParse; protected List fVariables = new ArrayList(100); @@ -65,40 +60,54 @@ public class PHPParserAction extends TextEditorAction { * Code called when the action is fired. */ public void run() { + boolean phpFlag = false; + + // try { + fileToParse = getPHPFile(); + parseFile(fileToParse); + } + + public static void parseFile(IFile fileToParse) { + boolean phpFlag = false; try { - fileToParse = getPHPFile(); + if (fileToParse == null) { - // should never happen + // TODO should never happen => should throw an exception System.err.println("Error : no file in the editor"); - // should throw an exception + return; } - // first delete all the previous markers - fileToParse.deleteMarkers(IMarker.PROBLEM, false, 0); - //IDocument document = getTextEditor().getDocumentProvider().getDocument(null); - //String text = document.get(); - - // String text = - // parse(document); - try { - InputStream iStream = fileToParse.getContents(); - // int c = iStream.read(); - parse(iStream); - iStream.close(); - } catch (IOException e) { + // TODO use isPHPFile() + String name = fileToParse.getName().toLowerCase(); + for (int i = 0; i < EXTENSIONS.length; i++) { + if (name.endsWith(EXTENSIONS[i])) { + phpFlag = true; // php file extension + break; + } + } + if (phpFlag) { + IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); + if (store.getString(PHPeclipsePlugin.PHP_PARSER_DEFAULT).equals(PHPeclipsePlugin.PHP_INTERNAL_PARSER)) { + // first delete all the previous markers + fileToParse.deleteMarkers(IMarker.PROBLEM, false, 0); + + //the tasks are removed here + fileToParse.deleteMarkers(IMarker.TASK, false, 0); + + // try { + // InputStream iStream = fileToParse.getContents(); + parse(fileToParse); //, iStream); + // iStream.close(); + // } catch (IOException e) { + // } + } else { + PHPParserSuperclass.phpExternalParse(fileToParse); + } } - - // String message = "Test error"; - // int lineNumber = 1; - // - // // create marker for the error - // - // setMarker(message, lineNumber, fileToParse); } catch (CoreException e) { } } - /** * Finds the file that's currently opened in the PHP Text Editor */ @@ -120,19 +129,19 @@ public class PHPParserAction extends TextEditorAction { /** * Create marker for the parse error */ -// protected void setMarker(String message, int lineNumber) throws CoreException { -// -// Hashtable attributes = new Hashtable(); -// MarkerUtilities.setMessage(attributes, message); -// if (message.startsWith(ERROR)) -// attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR)); -// else if (message.startsWith(WARNING)) -// attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING)); -// else -// attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); -// MarkerUtilities.setLineNumber(attributes, lineNumber); -// MarkerUtilities.createMarker(fileToParse, attributes, IMarker.PROBLEM); -// } + // protected void setMarker(String message, int lineNumber) throws CoreException { + // + // Hashtable attributes = new Hashtable(); + // MarkerUtilities.setMessage(attributes, message); + // if (message.startsWith(ERROR)) + // attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR)); + // else if (message.startsWith(WARNING)) + // attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING)); + // else + // attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO)); + // MarkerUtilities.setLineNumber(attributes, lineNumber); + // MarkerUtilities.createMarker(fileToParse, attributes, IMarker.PROBLEM); + // } // private String getIdentifier(InputStream iStream, int c) { // // int i = 0; @@ -142,7 +151,7 @@ public class PHPParserAction extends TextEditorAction { // identifier.append((char) c); // try { // while ((c = iStream.read()) != (-1)) { - // if (Character.isJavaIdentifierPart((char) c)) { + // if (Scanner.isPHPIdentifierPart((char) c)) { // identifier.append((char) c); // // } else if ((i == 0) && (c == '$')) { // // identifier.append((char)c); @@ -156,20 +165,35 @@ public class PHPParserAction extends TextEditorAction { // return identifier.toString(); // } - protected void parse(InputStream iStream) { - - StringBuffer buf = new StringBuffer(); - int c0; + protected static void parse(IFile fileToParse) { + + // StringBuffer buf = new StringBuffer(); + // int c0; + // try { + // while ((c0 = iStream.read()) != (-1)) { + // buf.append((char) c0); + // } + // } catch (IOException e) { + // return; + // } + // String input = buf.toString(); + + InputStream stream = null; + char[] charArray; try { - while ((c0 = iStream.read()) != (-1)) { - buf.append((char) c0); - } + stream = new BufferedInputStream(fileToParse.getContents()); + charArray = Util.getInputStreamAsCharArray(stream, -1, null); + PHPParserSuperclass parser = PHPParserManager.getParser(fileToParse); + parser.parse(new String(charArray)); + } catch (CoreException e) { } catch (IOException e) { - return; + } finally { + try { + if (stream!=null) { + stream.close(); + } + } catch (IOException e) { + } } - String input = buf.toString(); - - PHPParser parser = new PHPParser(fileToParse); - parser.htmlParse(input); } } \ No newline at end of file