X-Git-Url: http://git.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..6197bae 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java @@ -1,52 +1,47 @@ package net.sourceforge.phpeclipse.phpeditor; /********************************************************************** -Copyright (c) 2000, 2002 IBM Corp. and others. -All rights reserved. This program and the accompanying materials -are made available under the terms of the Common Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/cpl-v10.html - -Contributors: - IBM Corporation - Initial implementation - Klaus Hartlage - www.eclipseproject.de -**********************************************************************/ - + Copyright (c) 2000, 2002 IBM Corp. and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Common Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/cpl-v10.html + + Contributors: + IBM Corporation - Initial implementation + www.phpeclipse.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.phpdt.internal.ui.util.PHPFileUtil; +import net.sourceforge.phpeclipse.PHPeclipsePlugin; +import net.sourceforge.phpeclipse.actions.ExternalPHPParser; + 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; + /** - * 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(); protected IFile fileToParse; + protected List fVariables = new ArrayList(100); /** @@ -65,38 +60,30 @@ public class PHPParserAction extends TextEditorAction { * Code called when the action is fired. */ public void run() { - try { - fileToParse = getPHPFile(); - if (fileToParse == null) { - // should never happen - 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(); + boolean phpFlag = false; - // String text = - // parse(document); - try { - InputStream iStream = fileToParse.getContents(); - // int c = iStream.read(); - parse(iStream); - iStream.close(); - } catch (IOException e) { - } + // try { + fileToParse = getPHPFile(); + parseFile(fileToParse); + } - // String message = "Test error"; - // int lineNumber = 1; - // - // // create marker for the error - // - // setMarker(message, lineNumber, fileToParse); - } catch (CoreException e) { + public static void parseFile(IFile fileToParse) { + boolean phpFlag = false; + // try { + + if (fileToParse == null) { + // TODO should never happen => should throw an exception + System.err.println("Error : no file in the editor"); + + return; } + String name = fileToParse.getName(); //.toLowerCase(); + if (PHPFileUtil.isPHPFileName(name)) { + IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore(); + ExternalPHPParser parser = new ExternalPHPParser(fileToParse); + parser.phpExternalParse(); + } } /** @@ -117,59 +104,23 @@ public class PHPParserAction extends TextEditorAction { return null; } - /** - * 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); -// } - - // private String getIdentifier(InputStream iStream, int c) { - // // int i = 0; - // // char c; - // // int textLength = text.length(); - // StringBuffer identifier = new StringBuffer(); - // identifier.append((char) c); - // try { - // while ((c = iStream.read()) != (-1)) { - // if (Character.isJavaIdentifierPart((char) c)) { - // identifier.append((char) c); - // // } else if ((i == 0) && (c == '$')) { - // // identifier.append((char)c); - // } else { - // return identifier.toString(); - // } - // // i++; - // } - // } catch (IOException e) { - // } - // return identifier.toString(); - // } - - protected void parse(InputStream iStream) { - - StringBuffer buf = new StringBuffer(); - int c0; + protected static void parse(IFile fileToParse) { + 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); + ExternalPHPParser parser = new ExternalPHPParser(fileToParse); + parser.phpExternalParse(); + } 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