From 52ed29a3aab600167f1ed39f26102b5a509c2232 Mon Sep 17 00:00:00 2001 From: axelcl Date: Tue, 14 Jun 2005 04:29:07 +0000 Subject: [PATCH] Created a separated 'externaltools' plugin --- .../phpdt/internal/compiler/parser/Parser.java | 10 ++++++---- .../ui/preferences/PreferencesMessages.properties | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java index fb1b3cc..f7000aa 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java @@ -3703,6 +3703,11 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI } } + /** + * Parse and check the include file name + * + * @param includeToken + */ private void checkFileName(int includeToken) { // expr int start = scanner.getCurrentTokenStartPosition(); @@ -3765,15 +3770,12 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI IPath path = PHPFileUtil.determineFilePath(includeNameString, file, project); if (path == null) { - // reportSyntaxError("File: " + expression.toStringExpression() + " doesn't exist in project: " - // + project.getLocation().toString(), literal.sourceStart, literal.sourceEnd); + // SyntaxError: "File: << >> doesn't exist in project." String[] args = { expression.toStringExpression(), project.getLocation().toString() }; problemReporter.phpIncludeNotExistWarning(args, literal.sourceStart, literal.sourceEnd, referenceContext, compilationUnit.compilationResult); } else { try { - // String projectPath = ProjectPrefUtil.getDocumentRoot(file.getProject()).toString(); - // String filePath = file.getRawLocation().toString(); String filePath = path.toString(); String ext = file.getRawLocation().getFileExtension(); int fileExtensionLength = ext == null ? 0 : ext.length() + 1; diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages.properties b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages.properties index 2d4aa0e..1e8544f 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages.properties +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PreferencesMessages.properties @@ -188,6 +188,7 @@ JavaEditorPreferencePage.wrapStringsSQ= Wra&p single quoted PHP strings JavaEditorPreferencePage.escapeStringsSQ= &Escape text when pasting into a single quoted PHP string JavaEditorPreferencePage.addJavaDocTags= Add PHPdoc &tags JavaEditorPreferencePage.smartPaste= Pasting fo&r correct indentation +JavaEditorPreferencePage.p_rtrim_on_save= Remove trailing spaces on editor save JavaEditorPreferencePage.smartHomeEnd= S&mart cursor positioning at line start and end JavaEditorPreferencePage.subWordNavigation= Smart cursor positioning in &PHP names -- 1.7.1