mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-09 01:05:38 +02:00
Code Issues Wiki Activity

patch from Thomas Fletcher

Browse source
This commit is contained in:
David Inglis 2003-02-13 14:00:29 +00:00
parent 1e011191d0
commit 56971cf3df
7 changed files with 218 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,16 @@
2003-0213 Thomas Fletcher
* src/org/eclipse/cdt/internal/ui/cview/CView.java
* src/org/eclipse/cdt/internal/ui/cview/FilterSelectionAction.java
Cleaned up some text strings.
* src/org/eclipse/cdt/internal/corext/template/ContextTypeRegistry.java
* src/org/eclipse/cdt/internal/corext/template/default-templates.xml
* src/org/eclipse/cdt/internal/ui/preferences/TemplatePreferencePage.java
* src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java
Adds a C++ context and moves those templates which are C++ specific to that context
Allows you to use the C++ and C contexts when you are working in C++ code,
but only giving you the C contexts when you are working in C code.
2003-02-06 David Inglis 2003-02-06 David Inglis
* src/org/eclipse/cdt/internal/core/DocumentInputStream.java (Removed) * src/org/eclipse/cdt/internal/core/DocumentInputStream.java (Removed)
* src/org/eclipse/cdt/internal/ui/DocumentInputStream.java (Added) * src/org/eclipse/cdt/internal/ui/DocumentInputStream.java (Added)

6
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/ContextTypeRegistry.java
View file

@ -5,11 +5,13 @@ package org.eclipse.cdt.internal.corext.template;
* All Rights Reserved. * All Rights Reserved.
*/ */
import org.eclipse.cdt.internal.corext.template.c.CContextType;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import org.eclipse.cdt.internal.corext.template.c.CContextType;
import org.eclipse.cdt.internal.corext.template.c.CppContextType;
/** /**
* A singleton to keep track of all known context types. * A singleton to keep track of all known context types.
@ -63,7 +65,7 @@ public class ContextTypeRegistry {
// XXX bootstrap with C and C++ types // XXX bootstrap with C and C++ types
private ContextTypeRegistry() { private ContextTypeRegistry() {
add(new CContextType()); add(new CContextType());
//add(new CppContextType()); add(new CppContextType());
} }
} }

100
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/corext/template/default-templates.xml
View file

@ -9,87 +9,97 @@ All Rights Reserved.
<!-- C++ --> <!-- C++ -->
<template description="for loop" name="for" context="C" <template description="for loop" name="for" context="C">
>for (${var} = 0; ${var} &lt; ${max}; ${var}++) { for (${var} = 0; ${var} &lt; ${max}; ${var}++) {
${cursor} ${cursor}
}</template> }
</template>
<template description="for loop with temporary variable" name="for" context="C" <template description="for loop with temporary variable" name="for" context="C">
>for (int ${var} = 0; ${var} &lt; ${max}; ${var}++) { for (int ${var} = 0; ${var} &lt; ${max}; ${var}++) {
${cursor} ${cursor}
}</template> }
</template>
<template description="do while statement" name="do" context="C" <template description="do while statement" name="do" context="C">
>do { do {
${cursor} ${cursor}
} while (${condition});</template> } while (${condition});
</template>
<template description="switch case statement" name="switch" context="C" <template description="switch case statement" name="switch" context="C">
>switch (${key}) { switch (${key}) {
case ${value}: case ${value}:
${cursor} ${cursor}
break; break;
default: default:
break; break;
}</template> }
</template>
<template description="if statement" name="if" context="C" <template description="if statement" name="if" context="C">
>if (${condition}) { if (${condition}) {
${cursor} ${cursor}
}</template> }
</template>
<template description="if else statement" name="ifelse" context="C" <template description="if else statement" name="ifelse" context="C">
>if (${condition}) { if (${condition}) {
${cursor} ${cursor}
} else { } else {
}</template> }
</template>
<template description="else if block" name="elseif" context="C" <template description="else if block" name="elseif" context="C">
>else if (${condition}) { else if (${condition}) {
${cursor} ${cursor}
}</template> }
</template>
<template description="else block" name="else" context="C" <template description="else block" name="else" context="C">
>else { else {
${cursor} ${cursor}
}</template> }
</template>
<template description="try catch block" name="try" context="C" <template description="try catch block" name="try" context="C++">
>try { try {
${cursor} ${cursor}
} catch (${Exception} e) { } catch (${Exception} e) {
}</template> }
</template>
<template description="catch block" name="catch" context="C" <template description="catch block" name="catch" context="C++">
>catch (${Exception} e) { catch (${Exception} e) {
${cursor} ${cursor}
}</template> }
</template>
<template description="main method" name="main" context="C" <template description="main method" name="main" context="C">
>
int int
main(int argc, char **argv) { main(int argc, char **argv) {
${cursor} ${cursor}
}</template> }
<template description="class declaration" name="class" context="C"
>class ${name} {
${cursor}
private:
};</template>
<template description="using a namespace" name="using" context="C"
>using namespace ${namespace};
</template> </template>
<template description="namespace declaration" name="namespace" context="C" <template description="class declaration" name="class" context="C++">
class ${name} {
${cursor}
private:
};
</template>
<template description="using a namespace" name="using" context="C++">
using namespace ${namespace};
</template>
<template description="namespace declaration" name="namespace" context="C++"
>namespace ${namespace} { >namespace ${namespace} {
${cursor} ${cursor}
}</template> }</template>
<template description="create new object" name="new" context="C" <template description="create new object" name="new" context="C++"
>${type} ${name} = new ${type}(${arguments}); >${type} ${name} = new ${type}(${arguments});
</template> </template>

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/CView.java
View file

@ -519,8 +519,7 @@ public class CView extends ViewPart implements IMenuListener, ISetSelectionTarge
//sortByNameAction = new SortViewAction(this, false); //sortByNameAction = new SortViewAction(this, false);
//sortByTypeAction = new SortViewAction(this, true); //sortByTypeAction = new SortViewAction(this, true);
patternFilterAction = new FilterSelectionAction(shell, this, "Filters...");
patternFilterAction = new FilterSelectionAction(shell, this, "Filters..");
clibFilterAction = new ShowLibrariesAction(shell, this, "Show Referenced Libs"); clibFilterAction = new ShowLibrariesAction(shell, this, "Show Referenced Libs");
goIntoAction = new GoIntoAction(frameList); goIntoAction = new GoIntoAction(frameList);

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/FilterSelectionAction.java
View file

@ -53,9 +53,10 @@ class FilterSelectionAction extends SelectionProviderAction {
cview.getViewer(), cview.getViewer(),
contentProvider, contentProvider,
new LabelProvider(), new LabelProvider(),
"Select Filter"); //$NON-NLS-1$ "Select the filters to apply (matching files will be hidden):");
dialog.setInitialSelections(contentProvider.getInitialSelections()); dialog.setInitialSelections(contentProvider.getInitialSelections());
dialog.setTitle("C/C++ File Filters");
dialog.open(); dialog.open();
if (dialog.getReturnCode() == Window.OK) { if (dialog.getReturnCode() == Window.OK) {
Object[] results= dialog.getResult(); Object[] results= dialog.getResult();

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TemplatePreferencePage.java
View file

@ -357,7 +357,7 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench
Template template= new Template(); Template template= new Template();
ContextTypeRegistry registry=ContextTypeRegistry.getInstance(); ContextTypeRegistry registry=ContextTypeRegistry.getInstance();
ContextType type= registry.getContextType("java"); ContextType type= registry.getContextType("C");
String contextTypeName; String contextTypeName;
if (type != null) if (type != null)

111
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCompletionProcessor.java
View file

@ -5,24 +5,23 @@ package org.eclipse.cdt.internal.ui.text;
* All Rights Reserved. * All Rights Reserved.
*/ */
import org.eclipse.cdt.core.index.ITagEntry;
import org.eclipse.cdt.core.index.IndexModel;
import org.eclipse.cdt.core.index.TagFlags;
import org.eclipse.cdt.internal.corext.template.ContextType;
import org.eclipse.cdt.internal.corext.template.ContextTypeRegistry;
import org.eclipse.cdt.internal.ui.CCompletionContributorManager;
import org.eclipse.cdt.ui.CElementLabelProvider;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.text.template.TemplateEngine;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.IFunctionSummary;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import org.eclipse.swt.graphics.Image; import org.eclipse.cdt.core.index.ITagEntry;
import org.eclipse.swt.graphics.Point; import org.eclipse.cdt.core.index.IndexModel;
import org.eclipse.cdt.core.index.TagFlags;
import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.internal.corext.template.ContextType;
import org.eclipse.cdt.internal.corext.template.ContextTypeRegistry;
import org.eclipse.cdt.internal.ui.CCompletionContributorManager;
import org.eclipse.cdt.internal.ui.CPluginImages;
import org.eclipse.cdt.internal.ui.editor.CEditor;
import org.eclipse.cdt.internal.ui.text.template.TemplateEngine;
import org.eclipse.cdt.ui.CElementLabelProvider;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.IFunctionSummary;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadLocationException;
@ -33,7 +32,8 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jface.text.contentassist.IContextInformationValidator; import org.eclipse.jface.text.contentassist.IContextInformationValidator;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.IFileEditorInput;
@ -46,7 +46,7 @@ public class CCompletionProcessor implements IContentAssistProcessor {
private CEditor fEditor; private CEditor fEditor;
private char[] fProposalAutoActivationSet; private char[] fProposalAutoActivationSet;
private CCompletionProposalComparator fComparator; private CCompletionProposalComparator fComparator;
private TemplateEngine fTemplateEngine; private TemplateEngine[] fTemplateEngine;
private boolean fRestrictToMatchingCase; private boolean fRestrictToMatchingCase;
private boolean fAllowAddIncludes; private boolean fAllowAddIncludes;
@ -54,12 +54,46 @@ public class CCompletionProcessor implements IContentAssistProcessor {
private CElementLabelProvider fElementLabelProvider; private CElementLabelProvider fElementLabelProvider;
//private ImageRegistry fImageRegistry; //private ImageRegistry fImageRegistry;
public CCompletionProcessor(IEditorPart editor) { public CCompletionProcessor(IEditorPart editor) {
fEditor = (CEditor) editor; fEditor = (CEditor) editor;
ContextType contextType= ContextTypeRegistry.getInstance().getContextType("C"); //$NON-NLS-1$
if (contextType != null) //Determine if this is a C or a C++ file for the context completion + //This is _totally_ ugly and likely belongs in the main editor class.
fTemplateEngine= new TemplateEngine(contextType); String contextNames[] = new String[2];
ArrayList templateList = new ArrayList(2);
String filename = null;
if (fEditor != null && fEditor.getEditorInput() != null) {
filename = fEditor.getEditorInput().getName();
}
if (filename == null) {
contextNames[0] = "C"; //$NON-NLS-1$
contextNames[1] = "C++"; //$NON-NLS-1$
} else if (filename.endsWith(".c")) { //Straight C files are always C
contextNames[0] = "C"; //$NON-NLS-1$
} else if (
filename.endsWith(".cpp")
|| filename.endsWith(".cc")
|| filename.endsWith(".cxx")
|| filename.endsWith(".C")
|| filename.endsWith(".hxx")) {
contextNames[0] = "C++"; //$NON-NLS-1$
contextNames[1] = "C"; //$NON-NLS-1$
} else { //Defer to the nature of the project
IFile file = fEditor.getInputFile();
if (file != null && CoreModel.getDefault().hasCCNature(file.getProject())) {
contextNames[0] = "C++"; //$NON-NLS-1$
contextNames[1] = "C"; //$NON-NLS-1$
} else {
contextNames[0] = "C"; //$NON-NLS-1$
}
}
ContextType contextType;
for (int i = 0; i < contextNames.length; i++) {
contextType = ContextTypeRegistry.getInstance().getContextType(contextNames[i]);
if (contextType != null) {
templateList.add(new TemplateEngine(contextType));
}
}
fTemplateEngine = (TemplateEngine[]) templateList.toArray(new TemplateEngine[templateList.size()]);
fRestrictToMatchingCase = false; fRestrictToMatchingCase = false;
fAllowAddIncludes = true; fAllowAddIncludes = true;
@ -175,16 +209,19 @@ public class CCompletionProcessor implements IContentAssistProcessor {
if (results == null) if (results == null)
results = new ICCompletionProposal[0]; results = new ICCompletionProposal[0];
if (fTemplateEngine != null) { for (int i = 0; i < fTemplateEngine.length; i++) {
if (fTemplateEngine[i] == null) {
continue;
}
try { try {
fTemplateEngine.reset(); fTemplateEngine[i].reset();
fTemplateEngine.complete(viewer, documentOffset, null); fTemplateEngine[i].complete(viewer, documentOffset, null);
} catch (Exception x) { } catch (Exception x) {
System.out.println("Template Exception"); System.out.println("Template Exception");
CUIPlugin.getDefault().log(x); CUIPlugin.getDefault().log(x);
} }
ICCompletionProposal[] templateResults= fTemplateEngine.getResults(); ICCompletionProposal[] templateResults = fTemplateEngine[i].getResults();
if (results.length == 0) { if (results.length == 0) {
results = templateResults; results = templateResults;
} else { } else {
@ -201,7 +238,8 @@ public class CCompletionProcessor implements IContentAssistProcessor {
* applies to all proposals and not just those of the compilation unit. * applies to all proposals and not just those of the compilation unit.
*/ */
order(results); order(results);
if((results.length == 1) && (CUIPlugin.getDefault().getPreferenceStore().getBoolean(ContentAssistPreference.AUTOINSERT))) { if ((results.length == 1)
&& (CUIPlugin.getDefault().getPreferenceStore().getBoolean(ContentAssistPreference.AUTOINSERT))) {
results[0].apply(document); results[0].apply(document);
// Trick the content assistant into thinking we have no proposals // Trick the content assistant into thinking we have no proposals
return new ICCompletionProposal[0]; return new ICCompletionProposal[0];
@ -236,14 +274,9 @@ public class CCompletionProcessor implements IContentAssistProcessor {
String proto = fname + " - " + tags[i].getPattern(); String proto = fname + " - " + tags[i].getPattern();
//System.out.println("tagmatch " + fname + " proto " + proto + " type" + tags[i].getKind()); //System.out.println("tagmatch " + fname + " proto " + proto + " type" + tags[i].getKind());
if (tags[i].getKind() != TagFlags.T_MEMBER) { if (tags[i].getKind() != TagFlags.T_MEMBER) {
completions.add( completions.add(new CCompletionProposal(fname, region.getOffset(), region.getLength(),
new CCompletionProposal(
fname,
region.getOffset(),
region.getLength(),
//fname.length() + 1, //fname.length() + 1,
getTagImage(kind), getTagImage(kind), proto.equals("") ? (fname + "()") : proto,
proto.equals("") ? (fname + "()") : proto,
//null, //null,
//null)); //null));
3)); 3));
@ -311,7 +344,6 @@ public class CCompletionProcessor implements IContentAssistProcessor {
// Based on the frag name, build a list of completion proposals // Based on the frag name, build a list of completion proposals
// We look in two places: the content outline and the libs // We look in two places: the content outline and the libs
ArrayList completions = new ArrayList(); ArrayList completions = new ArrayList();
// Look in index manager // Look in index manager
@ -341,7 +373,6 @@ public class CCompletionProcessor implements IContentAssistProcessor {
} }
IFunctionSummary[] summary; IFunctionSummary[] summary;
//UserHelpFunctionInfo inf = plugin.getFunctionInfo(); //UserHelpFunctionInfo inf = plugin.getFunctionInfo();
@ -350,14 +381,9 @@ public class CCompletionProcessor implements IContentAssistProcessor {
for (int i = 0; i < summary.length; i++) { for (int i = 0; i < summary.length; i++) {
String fname = summary[i].getName(); String fname = summary[i].getName();
String proto = summary[i].getPrototype(); String proto = summary[i].getPrototype();
completions.add( completions.add(new CCompletionProposal(fname + "()", region.getOffset(), region.getLength(),
new CCompletionProposal(
fname + "()",
region.getOffset(),
region.getLength(),
//fname.length() + 1, //fname.length() + 1,
CPluginImages.get(CPluginImages.IMG_OBJS_FUNCTION), CPluginImages.get(CPluginImages.IMG_OBJS_FUNCTION), proto.equals("") ? (fname + "()") : proto,
proto.equals("") ? (fname + "()") : proto,
//null, //null,
//null)); //null));
2)); 2));
@ -389,4 +415,3 @@ public class CCompletionProcessor implements IContentAssistProcessor {
} }
} }