import net.sourceforge.phpdt.internal.ui.text.template.TemplateEngine;
import net.sourceforge.phpeclipse.PHPeclipsePlugin;
import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
-import net.sourceforge.phpeclipse.phpeditor.AbstractContentOutlinePage;
+import net.sourceforge.phpeclipse.phpeditor.JavaOutlinePage;
import net.sourceforge.phpeclipse.phpeditor.PHPContentOutlinePage;
import net.sourceforge.phpeclipse.phpeditor.PHPEditor;
import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr;
case ITerminalSymbols.TokenNameMINUS_GREATER :
// dereferencing operator '->' found
lastSignificantToken = ITerminalSymbols.TokenNameMINUS_GREATER;
- if (beforeLastToken == ITerminalSymbols.TokenNamethis) {
- lastSignificantToken = ITerminalSymbols.TokenNamethis;
+ if (beforeLastToken == ITerminalSymbols.TokenNameVariable) {
+ lastSignificantToken = ITerminalSymbols.TokenNameVariable;
}
break;
case ITerminalSymbols.TokenNamenew :
if (offset > 0) {
PHPEditor editor = null;
- AbstractContentOutlinePage outlinePage = null;
+// JavaOutlinePage outlinePage = null;
IEditorPart targetEditor = PHPeclipsePlugin.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
if (targetEditor != null && (targetEditor instanceof PHPEditor)) {
editor = (PHPEditor) targetEditor;
file = ((IFileEditorInput) editor.getEditorInput()).getFile();
project = file.getProject();
- outlinePage = editor.getfOutlinePage();
- if (outlinePage instanceof PHPContentOutlinePage) {
- identifiers = ((PHPContentOutlinePage) outlinePage).getVariables();
- }
+// outlinePage = editor.getfOutlinePage();
+ // TODO: get the identifiers from the new model
+// if (outlinePage instanceof PHPContentOutlinePage) {
+// identifiers = ((PHPContentOutlinePage) outlinePage).getVariables();
+// }
}
}
int lastSignificantToken = getLastToken(viewer, offset, context);
boolean useClassMembers =
(lastSignificantToken == ITerminalSymbols.TokenNameMINUS_GREATER) ||
- (lastSignificantToken == ITerminalSymbols.TokenNamethis) ||
+ (lastSignificantToken == ITerminalSymbols.TokenNameVariable) ||
(lastSignificantToken == ITerminalSymbols.TokenNamenew);
boolean emptyPrefix = prefix == null || prefix.equals("");