mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-08 16:55:38 +02:00
patch from Thomas Fletcher
This commit is contained in:
David Inglis
parent
1e011191d0
commit
56971cf3df
7 changed files with 218 additions and 168 deletions
|
|
@ -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
|
||||
* src/org/eclipse/cdt/internal/core/DocumentInputStream.java (Removed)
|
||||
* src/org/eclipse/cdt/internal/ui/DocumentInputStream.java (Added)
|
||||
|
|
|
|||
|
|
@ -5,11 +5,13 @@ package org.eclipse.cdt.internal.corext.template;
|
|||
* All Rights Reserved.
|
||||
*/
|
||||
|
||||
import org.eclipse.cdt.internal.corext.template.c.CContextType;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
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.
|
||||
|
|
@ -63,7 +65,7 @@ public class ContextTypeRegistry {
|
|||
// XXX bootstrap with C and C++ types
|
||||
private ContextTypeRegistry() {
|
||||
add(new CContextType());
|
||||
//add(new CppContextType());
|
||||
add(new CppContextType());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,87 +9,97 @@ All Rights Reserved.
|
|||
|
||||
<!-- C++ -->
|
||||
|
||||
<template description="for loop" name="for" context="C"
|
||||
>for (${var} = 0; ${var} < ${max}; ${var}++) {
|
||||
<template description="for loop" name="for" context="C">
|
||||
for (${var} = 0; ${var} < ${max}; ${var}++) {
|
||||
${cursor}
|
||||
}</template>
|
||||
}
|
||||
</template>
|
||||
|
||||
<template description="for loop with temporary variable" name="for" context="C"
|
||||
>for (int ${var} = 0; ${var} < ${max}; ${var}++) {
|
||||
<template description="for loop with temporary variable" name="for" context="C">
|
||||
for (int ${var} = 0; ${var} < ${max}; ${var}++) {
|
||||
${cursor}
|
||||
}</template>
|
||||
}
|
||||
</template>
|
||||
|
||||
<template description="do while statement" name="do" context="C"
|
||||
>do {
|
||||
<template description="do while statement" name="do" context="C">
|
||||
do {
|
||||
${cursor}
|
||||
} while (${condition});</template>
|
||||
} while (${condition});
|
||||
</template>
|
||||
|
||||
<template description="switch case statement" name="switch" context="C"
|
||||
>switch (${key}) {
|
||||
<template description="switch case statement" name="switch" context="C">
|
||||
switch (${key}) {
|
||||
case ${value}:
|
||||
${cursor}
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}</template>
|
||||
}
|
||||
</template>
|
||||
|
||||
<template description="if statement" name="if" context="C"
|
||||
>if (${condition}) {
|
||||
<template description="if statement" name="if" context="C">
|
||||
if (${condition}) {
|
||||
${cursor}
|
||||
}</template>
|
||||
}
|
||||
</template>
|
||||
|
||||
<template description="if else statement" name="ifelse" context="C"
|
||||
>if (${condition}) {
|
||||
<template description="if else statement" name="ifelse" context="C">
|
||||
if (${condition}) {
|
||||
${cursor}
|
||||
} else {
|
||||
|
||||
}</template>
|
||||
}
|
||||
</template>
|
||||
|
||||
<template description="else if block" name="elseif" context="C"
|
||||
>else if (${condition}) {
|
||||
<template description="else if block" name="elseif" context="C">
|
||||
else if (${condition}) {
|
||||
${cursor}
|
||||
}</template>
|
||||
}
|
||||
</template>
|
||||
|
||||
<template description="else block" name="else" context="C"
|
||||
>else {
|
||||
<template description="else block" name="else" context="C">
|
||||
else {
|
||||
${cursor}
|
||||
}</template>
|
||||
}
|
||||
</template>
|
||||
|
||||
<template description="try catch block" name="try" context="C"
|
||||
>try {
|
||||
<template description="try catch block" name="try" context="C++">
|
||||
try {
|
||||
${cursor}
|
||||
} catch (${Exception} e) {
|
||||
}</template>
|
||||
}
|
||||
</template>
|
||||
|
||||
<template description="catch block" name="catch" context="C"
|
||||
>catch (${Exception} e) {
|
||||
<template description="catch block" name="catch" context="C++">
|
||||
catch (${Exception} e) {
|
||||
${cursor}
|
||||
}</template>
|
||||
}
|
||||
</template>
|
||||
|
||||
<template description="main method" name="main" context="C"
|
||||
>
|
||||
<template description="main method" name="main" context="C">
|
||||
int
|
||||
main(int argc, char **argv) {
|
||||
${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 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} {
|
||||
${cursor}
|
||||
}</template>
|
||||
|
||||
<template description="create new object" name="new" context="C"
|
||||
<template description="create new object" name="new" context="C++"
|
||||
>${type} ${name} = new ${type}(${arguments});
|
||||
</template>
|
||||
|
||||
|
|
|
|||
|
|
@ -519,8 +519,7 @@ public class CView extends ViewPart implements IMenuListener, ISetSelectionTarge
|
|||
|
||||
//sortByNameAction = new SortViewAction(this, false);
|
||||
//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");
|
||||
|
||||
goIntoAction = new GoIntoAction(frameList);
|
||||
|
|
|
|||
|
|
@ -53,9 +53,10 @@ class FilterSelectionAction extends SelectionProviderAction {
|
|||
cview.getViewer(),
|
||||
contentProvider,
|
||||
new LabelProvider(),
|
||||
"Select Filter"); //$NON-NLS-1$
|
||||
"Select the filters to apply (matching files will be hidden):");
|
||||
|
||||
dialog.setInitialSelections(contentProvider.getInitialSelections());
|
||||
dialog.setTitle("C/C++ File Filters");
|
||||
dialog.open();
|
||||
if (dialog.getReturnCode() == Window.OK) {
|
||||
Object[] results= dialog.getResult();
|
||||
|
|
|
|||
|
|
@ -357,7 +357,7 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench
|
|||
Template template= new Template();
|
||||
|
||||
ContextTypeRegistry registry=ContextTypeRegistry.getInstance();
|
||||
ContextType type= registry.getContextType("java");
|
||||
ContextType type= registry.getContextType("C");
|
||||
|
||||
String contextTypeName;
|
||||
if (type != null)
|
||||
|
|
|
|||
|
|
@ -5,24 +5,23 @@ package org.eclipse.cdt.internal.ui.text;
|
|||
* 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.Arrays;
|
||||
|
||||
import org.eclipse.swt.graphics.Image;
|
||||
import org.eclipse.swt.graphics.Point;
|
||||
|
||||
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.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.runtime.CoreException;
|
||||
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.IContextInformation;
|
||||
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.IEditorPart;
|
||||
import org.eclipse.ui.IFileEditorInput;
|
||||
|
|
@ -46,7 +46,7 @@ public class CCompletionProcessor implements IContentAssistProcessor {
|
|||
private CEditor fEditor;
|
||||
private char[] fProposalAutoActivationSet;
|
||||
private CCompletionProposalComparator fComparator;
|
||||
private TemplateEngine fTemplateEngine;
|
||||
private TemplateEngine[] fTemplateEngine;
|
||||
|
||||
private boolean fRestrictToMatchingCase;
|
||||
private boolean fAllowAddIncludes;
|
||||
|
|
@ -54,12 +54,46 @@ public class CCompletionProcessor implements IContentAssistProcessor {
|
|||
private CElementLabelProvider fElementLabelProvider;
|
||||
//private ImageRegistry fImageRegistry;
|
||||
|
||||
|
||||
public CCompletionProcessor(IEditorPart editor) {
|
||||
fEditor = (CEditor) editor;
|
||||
ContextType contextType= ContextTypeRegistry.getInstance().getContextType("C"); //$NON-NLS-1$
|
||||
if (contextType != null)
|
||||
fTemplateEngine= new TemplateEngine(contextType);
|
||||
|
||||
//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.
|
||||
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;
|
||||
fAllowAddIncludes = true;
|
||||
|
||||
|
|
@ -175,16 +209,19 @@ public class CCompletionProcessor implements IContentAssistProcessor {
|
|||
if (results == null)
|
||||
results = new ICCompletionProposal[0];
|
||||
|
||||
if (fTemplateEngine != null) {
|
||||
for (int i = 0; i < fTemplateEngine.length; i++) {
|
||||
if (fTemplateEngine[i] == null) {
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
fTemplateEngine.reset();
|
||||
fTemplateEngine.complete(viewer, documentOffset, null);
|
||||
fTemplateEngine[i].reset();
|
||||
fTemplateEngine[i].complete(viewer, documentOffset, null);
|
||||
} catch (Exception x) {
|
||||
System.out.println("Template Exception");
|
||||
CUIPlugin.getDefault().log(x);
|
||||
}
|
||||
|
||||
ICCompletionProposal[] templateResults= fTemplateEngine.getResults();
|
||||
ICCompletionProposal[] templateResults = fTemplateEngine[i].getResults();
|
||||
if (results.length == 0) {
|
||||
results = templateResults;
|
||||
} else {
|
||||
|
|
@ -201,7 +238,8 @@ public class CCompletionProcessor implements IContentAssistProcessor {
|
|||
* applies to all proposals and not just those of the compilation unit.
|
||||
*/
|
||||
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);
|
||||
// Trick the content assistant into thinking we have no proposals
|
||||
return new ICCompletionProposal[0];
|
||||
|
|
@ -236,14 +274,9 @@ public class CCompletionProcessor implements IContentAssistProcessor {
|
|||
String proto = fname + " - " + tags[i].getPattern();
|
||||
//System.out.println("tagmatch " + fname + " proto " + proto + " type" + tags[i].getKind());
|
||||
if (tags[i].getKind() != TagFlags.T_MEMBER) {
|
||||
completions.add(
|
||||
new CCompletionProposal(
|
||||
fname,
|
||||
region.getOffset(),
|
||||
region.getLength(),
|
||||
completions.add(new CCompletionProposal(fname, region.getOffset(), region.getLength(),
|
||||
//fname.length() + 1,
|
||||
getTagImage(kind),
|
||||
proto.equals("") ? (fname + "()") : proto,
|
||||
getTagImage(kind), proto.equals("") ? (fname + "()") : proto,
|
||||
//null,
|
||||
//null));
|
||||
3));
|
||||
|
|
@ -311,7 +344,6 @@ public class CCompletionProcessor implements IContentAssistProcessor {
|
|||
// Based on the frag name, build a list of completion proposals
|
||||
// We look in two places: the content outline and the libs
|
||||
|
||||
|
||||
ArrayList completions = new ArrayList();
|
||||
|
||||
// Look in index manager
|
||||
|
|
@ -341,7 +373,6 @@ public class CCompletionProcessor implements IContentAssistProcessor {
|
|||
|
||||
}
|
||||
|
||||
|
||||
IFunctionSummary[] summary;
|
||||
|
||||
//UserHelpFunctionInfo inf = plugin.getFunctionInfo();
|
||||
|
|
@ -350,14 +381,9 @@ public class CCompletionProcessor implements IContentAssistProcessor {
|
|||
for (int i = 0; i < summary.length; i++) {
|
||||
String fname = summary[i].getName();
|
||||
String proto = summary[i].getPrototype();
|
||||
completions.add(
|
||||
new CCompletionProposal(
|
||||
fname + "()",
|
||||
region.getOffset(),
|
||||
region.getLength(),
|
||||
completions.add(new CCompletionProposal(fname + "()", region.getOffset(), region.getLength(),
|
||||
//fname.length() + 1,
|
||||
CPluginImages.get(CPluginImages.IMG_OBJS_FUNCTION),
|
||||
proto.equals("") ? (fname + "()") : proto,
|
||||
CPluginImages.get(CPluginImages.IMG_OBJS_FUNCTION), proto.equals("") ? (fname + "()") : proto,
|
||||
//null,
|
||||
//null));
|
||||
2));
|
||||
|
|
@ -389,4 +415,3 @@ public class CCompletionProcessor implements IContentAssistProcessor {
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue