From c96bd8b8e9644262a7c4ae8906c74abb21c04df0 Mon Sep 17 00:00:00 2001 From: khartlage Date: Fri, 27 Dec 2002 15:47:18 +0000 Subject: [PATCH] Improved auto completion --- .../icons/obj16/builtin_obj.gif | Bin 0 -> 152 bytes .../icons/obj16/template_obj.gif | Bin 0 -> 155 bytes net.sourceforge.phpeclipse/icons/obj16/var_obj.gif | Bin 0 -> 152 bytes .../sourceforge/phpdt/internal/ui/PHPUiImages.java | 10 +- .../ui/text/template/IdentifierEngine.java | 19 +- .../ui/text/template/IdentifierProposal.java | 14 +- .../internal/ui/text/template/TemplateEngine.java | 17 +- .../ui/text/template/TemplateProposal.java | 9 +- .../phpeclipse/PHPSyntaxPreferencePage.java | 2 +- .../phpeditor/php/PHPCompletionProcessor.java | 260 ++++++++++---------- 10 files changed, 171 insertions(+), 160 deletions(-) create mode 100644 net.sourceforge.phpeclipse/icons/obj16/builtin_obj.gif create mode 100644 net.sourceforge.phpeclipse/icons/obj16/template_obj.gif create mode 100644 net.sourceforge.phpeclipse/icons/obj16/var_obj.gif diff --git a/net.sourceforge.phpeclipse/icons/obj16/builtin_obj.gif b/net.sourceforge.phpeclipse/icons/obj16/builtin_obj.gif new file mode 100644 index 0000000000000000000000000000000000000000..190e86dd9c90380ead07e1b7a23343d2b6c2e7d2 GIT binary patch literal 152 zcmZ?wbhEHb6krfw*v!Ci;J^X<`Steo@%8)X+t0VRkGJ1{e}Db{`2YX^GhhRXKUo+V z7)~+hfFwa?FtE4^obX(|H==9rXElWzp-vfHDuoI<)dEbRt4<`|Uct7`+)rfk%~hey mjHO%dy%xW7wQ57eWOiFKf2EZl5#Bnull. -// * -// * @param replacementString the actual string to be inserted into the document -// * @param replacementOffset the offset of the text to be replaced -// * @param replacementLength the length of the text to be replaced -// * @param cursorPosition the position of the cursor following the insert relative to replacementOffset -// */ -// public VariablesCompletionProposal( -// String replacementString, -// int replacementOffset, -// int replacementLength, -// int cursorPosition) { -// this(replacementString, replacementOffset, replacementLength, cursorPosition, null, null, null, null); -// } -// -// /** -// * Creates a new completion proposal. All fields are initialized based on the provided information. -// * -// * @param replacementString the actual string to be inserted into the document -// * @param replacementOffset the offset of the text to be replaced -// * @param replacementLength the length of the text to be replaced -// * @param cursorPosition the position of the cursor following the insert relative to replacementOffset -// * @param image the image to display for this proposal -// * @param displayString the string to be displayed for the proposal -// * @param contentInformation the context information associated with this proposal -// * @param additionalProposalInfo the additional information associated with this proposal -// */ -// public VariablesCompletionProposal( -// String replacementString, -// int replacementOffset, -// int replacementLength, -// int cursorPosition, -// Image image, -// String displayString, -// IContextInformation contextInformation, -// String additionalProposalInfo) { -// // Assert.isNotNull(replacementString); -// // Assert.isTrue(replacementOffset >= 0); -// // Assert.isTrue(replacementLength >= 0); -// // Assert.isTrue(cursorPosition >= 0); -// -// fReplacementString = replacementString; -// fReplacementOffset = replacementOffset; -// fReplacementLength = replacementLength; -// fCursorPosition = cursorPosition; -// fImage = image; -// fDisplayString = displayString; -// fContextInformation = contextInformation; -// fAdditionalProposalInfo = additionalProposalInfo; -// } -// -// /* -// * @see ICompletionProposal#apply -// */ -// public void apply(IDocument document) { -// try { -// document.replace(fReplacementOffset, fReplacementLength, fReplacementString); -// } catch (BadLocationException x) { -// // ignore -// } -// } -// -// /* -// * @see ICompletionProposal#getSelection -// */ -// public Point getSelection(IDocument document) { -// return new Point(fReplacementOffset + fCursorPosition, 0); -// } -// -// /* -// * @see ICompletionProposal#getContextInformation() -// */ -// public IContextInformation getContextInformation() { -// return fContextInformation; -// } -// -// /* -// * @see ICompletionProposal#getImage() -// */ -// public Image getImage() { -// return fImage; -// } -// -// /* -// * @see ICompletionProposal#getDisplayString() -// */ -// public String getDisplayString() { -// if (fDisplayString != null) -// return fDisplayString; -// return fReplacementString; -// } -// -// /* -// * @see ICompletionProposal#getAdditionalProposalInfo() -// */ -// public String getAdditionalProposalInfo() { -// return fAdditionalProposalInfo; -// } -// /** -// * Returns the relevance of the proposal. -// */ -// public int getRelevance() { -// return 0; -// } -// } + // public final class VariablesCompletionProposal implements IJavaCompletionProposal { + // private String fDisplayString; + // private String fReplacementString; + // private int fReplacementOffset; + // private int fReplacementLength; + // private int fCursorPosition; + // private Image fImage; + // private IContextInformation fContextInformation; + // private String fAdditionalProposalInfo; + // + // /** + // * Creates a new completion proposal based on the provided information. The replacement string is + // * considered being the display string too. All remaining fields are set to null. + // * + // * @param replacementString the actual string to be inserted into the document + // * @param replacementOffset the offset of the text to be replaced + // * @param replacementLength the length of the text to be replaced + // * @param cursorPosition the position of the cursor following the insert relative to replacementOffset + // */ + // public VariablesCompletionProposal( + // String replacementString, + // int replacementOffset, + // int replacementLength, + // int cursorPosition) { + // this(replacementString, replacementOffset, replacementLength, cursorPosition, null, null, null, null); + // } + // + // /** + // * Creates a new completion proposal. All fields are initialized based on the provided information. + // * + // * @param replacementString the actual string to be inserted into the document + // * @param replacementOffset the offset of the text to be replaced + // * @param replacementLength the length of the text to be replaced + // * @param cursorPosition the position of the cursor following the insert relative to replacementOffset + // * @param image the image to display for this proposal + // * @param displayString the string to be displayed for the proposal + // * @param contentInformation the context information associated with this proposal + // * @param additionalProposalInfo the additional information associated with this proposal + // */ + // public VariablesCompletionProposal( + // String replacementString, + // int replacementOffset, + // int replacementLength, + // int cursorPosition, + // Image image, + // String displayString, + // IContextInformation contextInformation, + // String additionalProposalInfo) { + // // Assert.isNotNull(replacementString); + // // Assert.isTrue(replacementOffset >= 0); + // // Assert.isTrue(replacementLength >= 0); + // // Assert.isTrue(cursorPosition >= 0); + // + // fReplacementString = replacementString; + // fReplacementOffset = replacementOffset; + // fReplacementLength = replacementLength; + // fCursorPosition = cursorPosition; + // fImage = image; + // fDisplayString = displayString; + // fContextInformation = contextInformation; + // fAdditionalProposalInfo = additionalProposalInfo; + // } + // + // /* + // * @see ICompletionProposal#apply + // */ + // public void apply(IDocument document) { + // try { + // document.replace(fReplacementOffset, fReplacementLength, fReplacementString); + // } catch (BadLocationException x) { + // // ignore + // } + // } + // + // /* + // * @see ICompletionProposal#getSelection + // */ + // public Point getSelection(IDocument document) { + // return new Point(fReplacementOffset + fCursorPosition, 0); + // } + // + // /* + // * @see ICompletionProposal#getContextInformation() + // */ + // public IContextInformation getContextInformation() { + // return fContextInformation; + // } + // + // /* + // * @see ICompletionProposal#getImage() + // */ + // public Image getImage() { + // return fImage; + // } + // + // /* + // * @see ICompletionProposal#getDisplayString() + // */ + // public String getDisplayString() { + // if (fDisplayString != null) + // return fDisplayString; + // return fReplacementString; + // } + // + // /* + // * @see ICompletionProposal#getAdditionalProposalInfo() + // */ + // public String getAdditionalProposalInfo() { + // return fAdditionalProposalInfo; + // } + // /** + // * Returns the relevance of the proposal. + // */ + // public int getRelevance() { + // return 0; + // } + // } protected final static String[] fgProposals = PHPFunctionNames.FUNCTION_NAMES; @@ -288,7 +285,7 @@ public class PHPCompletionProcessor implements IContentAssistProcessor { IDocument document = viewer.getDocument(); Object[] identifiers = null; if (offset > 0) { - + PHPEditor editor = null; PHPContentOutlinePage outlinePage = null; @@ -299,6 +296,7 @@ public class PHPCompletionProcessor implements IContentAssistProcessor { identifiers = outlinePage.getVariables(); } } + if (fTemplateEngine != null) { ICompletionProposal[] results; // try { @@ -329,12 +327,26 @@ public class PHPCompletionProcessor implements IContentAssistProcessor { identifierResults = identifierEngine.getResults(); } } - + + IJavaCompletionProposal[] builtinResults = new IJavaCompletionProposal[0]; + if (PHPFunctionNames.FUNCTION_NAMES != null) { + BuiltInEngine builtinEngine; + String proposal; + + ContextType contextType = ContextTypeRegistry.getInstance().getContextType("php"); //$NON-NLS-1$ + if (contextType != null) { + builtinEngine = new BuiltInEngine(contextType); + builtinEngine.complete(viewer, offset, PHPFunctionNames.FUNCTION_NAMES); + builtinResults = builtinEngine.getResults(); + } + } + // concatenate arrays IJavaCompletionProposal[] total; - total = new IJavaCompletionProposal[templateResults.length + identifierResults.length]; + total = new IJavaCompletionProposal[templateResults.length + identifierResults.length + builtinResults.length]; System.arraycopy(templateResults, 0, total, 0, templateResults.length); System.arraycopy(identifierResults, 0, total, templateResults.length, identifierResults.length); + System.arraycopy(builtinResults, 0, total, templateResults.length + identifierResults.length, builtinResults.length); results = total; fNumberOfComputedResults = (results == null ? 0 : results.length); -- 1.7.1