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 515f19f..e9376f5 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java @@ -35,6 +35,7 @@ import org.eclipse.ui.texteditor.TextEditorAction; public class PHPParserAction extends TextEditorAction { private static PHPParserAction instance = new PHPParserAction(); + private static String[] EXTENSIONS = { ".php", ".php3", ".php4", ".inc", ".phtml" }; protected IFile fileToParse; protected List fVariables = new ArrayList(100); @@ -55,6 +56,7 @@ public class PHPParserAction extends TextEditorAction { * Code called when the action is fired. */ public void run() { + boolean phpFlag = false; try { fileToParse = getPHPFile(); if (fileToParse == null) { @@ -63,22 +65,30 @@ public class PHPParserAction extends TextEditorAction { // should throw an exception return; } - 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); - - try { - InputStream iStream = fileToParse.getContents(); - // int c = iStream.read(); - parse(iStream); - iStream.close(); - } catch (IOException e) { + String name = fileToParse.getName(); + 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); + + try { + InputStream iStream = fileToParse.getContents(); + // int c = iStream.read(); + parse(iStream); + iStream.close(); + } catch (IOException e) { + } + } else { + PHPParser.phpExternalParse(fileToParse); } - } else { - PHPParser.phpExternalParse(fileToParse); } - } catch (CoreException e) { } @@ -143,9 +153,9 @@ public class PHPParserAction extends TextEditorAction { protected void parse(InputStream iStream) { - StringBuffer buf = new StringBuffer(); + StringBuffer buf = new StringBuffer(); int c0; - try { + try { while ((c0 = iStream.read()) != (-1)) { buf.append((char) c0); }