mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-23 08:55:25 +02:00
PDOM Search, introduced the new Search Page that will hook up the search dialog to the PDOM Search Query. The old page is still there but called 'Old C/C++ Search'.
This commit is contained in:
Doug Schaefer
parent
8bb69fe88f
commit
3aea4555f6
8 changed files with 693 additions and 69 deletions
|
|
@ -1053,19 +1053,27 @@
|
|||
</command>
|
||||
</extension>
|
||||
<extension
|
||||
id="org.eclipse.cdt.ui.CSearchPage"
|
||||
id="pdomSearchPage"
|
||||
name="CSearchPage"
|
||||
point="org.eclipse.search.searchPages">
|
||||
<page
|
||||
canSearchEnclosingProjects="true"
|
||||
class="org.eclipse.cdt.internal.ui.search.PDOMSearchPage"
|
||||
extensions="c:90,cpp:90, cxx:90, cc:90,C:90, h:90, hh:90, hpp:90, H:90"
|
||||
icon="icons/obj16/csearch_obj.gif"
|
||||
id="org.eclipse.cdt.ui.pdomSearchPage"
|
||||
label="%CSearchPage.label"
|
||||
showScopeSection="true"
|
||||
sizeHint="460, 160"/>
|
||||
<page
|
||||
canSearchEnclosingProjects="true"
|
||||
class="org.eclipse.cdt.internal.ui.search.CSearchPage"
|
||||
extensions="c:90,cpp:90, cxx:90, cc:90,C:90, h:90, hh:90, hpp:90, H:90"
|
||||
icon="icons/obj16/csearch_obj.gif"
|
||||
id="org.eclipse.cdt.ui.CSearchPage"
|
||||
label="%CSearchPage.label"
|
||||
label="Old C/C++ Search"
|
||||
showScopeSection="true"
|
||||
sizeHint="460, 160">
|
||||
</page>
|
||||
sizeHint="460, 160"/>
|
||||
</extension>
|
||||
<extension
|
||||
point="org.eclipse.search.searchResultSorters">
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
package org.eclipse.cdt.internal.ui.indexview;
|
||||
|
||||
import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding;
|
||||
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery;
|
||||
import org.eclipse.cdt.internal.ui.search.PDOMSearchBindingQuery;
|
||||
import org.eclipse.cdt.ui.CUIPlugin;
|
||||
import org.eclipse.jface.viewers.ISelection;
|
||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
|
|
@ -39,8 +39,8 @@ public class FindDeclarationsAction extends IndexAction {
|
|||
}
|
||||
|
||||
public void run() {
|
||||
PDOMSearchQuery query = new PDOMSearchQuery(getBinding(),
|
||||
PDOMSearchQuery.FIND_DECLARATIONS | PDOMSearchQuery.FIND_DEFINITIONS);
|
||||
PDOMSearchBindingQuery query = new PDOMSearchBindingQuery(getBinding(),
|
||||
PDOMSearchBindingQuery.FIND_DECLARATIONS | PDOMSearchBindingQuery.FIND_DEFINITIONS);
|
||||
|
||||
NewSearchUI.activateSearchResultView();
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
package org.eclipse.cdt.internal.ui.indexview;
|
||||
|
||||
import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding;
|
||||
import org.eclipse.cdt.internal.ui.search.PDOMSearchQuery;
|
||||
import org.eclipse.cdt.internal.ui.search.PDOMSearchBindingQuery;
|
||||
import org.eclipse.cdt.ui.CUIPlugin;
|
||||
import org.eclipse.jface.viewers.ISelection;
|
||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
|
|
@ -39,7 +39,7 @@ public class FindReferencesAction extends IndexAction {
|
|||
}
|
||||
|
||||
public void run() {
|
||||
PDOMSearchQuery query = new PDOMSearchQuery(getBinding(), PDOMSearchQuery.FIND_REFERENCES);
|
||||
PDOMSearchBindingQuery query = new PDOMSearchBindingQuery(getBinding(), PDOMSearchBindingQuery.FIND_REFERENCES);
|
||||
|
||||
NewSearchUI.activateSearchResultView();
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@ import org.eclipse.ui.IWorkbenchWindowActionDelegate;
|
|||
*/
|
||||
public class OpenCSearchPageAction implements IWorkbenchWindowActionDelegate {
|
||||
|
||||
private static final String C_SEARCH_PAGE_ID= "org.eclipse.cdt.ui.CSearchPage"; //$NON-NLS-1$
|
||||
|
||||
private IWorkbenchWindow fWindow;
|
||||
|
||||
public OpenCSearchPageAction() {
|
||||
|
|
@ -44,7 +42,7 @@ public class OpenCSearchPageAction implements IWorkbenchWindowActionDelegate {
|
|||
beep();
|
||||
return;
|
||||
}
|
||||
NewSearchUI.openSearchDialog(fWindow, C_SEARCH_PAGE_ID);
|
||||
NewSearchUI.openSearchDialog(fWindow, PDOMSearchPage.EXTENSION_POINT_ID);
|
||||
}
|
||||
|
||||
public void selectionChanged(IAction action, ISelection selection) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,75 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2006 QNX Software Systems and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* QNX - Initial API and implementation
|
||||
*******************************************************************************/
|
||||
|
||||
package org.eclipse.cdt.internal.ui.search;
|
||||
|
||||
import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
|
||||
import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding;
|
||||
import org.eclipse.cdt.internal.core.pdom.dom.PDOMName;
|
||||
import org.eclipse.cdt.ui.CUIPlugin;
|
||||
import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.core.runtime.IStatus;
|
||||
import org.eclipse.core.runtime.OperationCanceledException;
|
||||
import org.eclipse.core.runtime.Status;
|
||||
|
||||
/**
|
||||
* @author Doug Schaefer
|
||||
*
|
||||
* This is the search query to be used for searching the PDOM.
|
||||
*/
|
||||
public class PDOMSearchBindingQuery extends PDOMSearchQuery {
|
||||
|
||||
private PDOMBinding binding;
|
||||
|
||||
public PDOMSearchBindingQuery(PDOMBinding binding, int flags) {
|
||||
super(flags);
|
||||
this.binding = binding;
|
||||
}
|
||||
|
||||
public IStatus run(IProgressMonitor monitor) throws OperationCanceledException {
|
||||
try {
|
||||
if ((flags & FIND_DECLARATIONS) != 0) {
|
||||
PDOMName name = binding.getFirstDeclaration();
|
||||
while (name != null) {
|
||||
IASTFileLocation loc = name.getFileLocation();
|
||||
result.addMatch(new PDOMSearchMatch(name, loc.getNodeOffset(), loc.getNodeLength()));
|
||||
name = name.getNextInBinding();
|
||||
}
|
||||
}
|
||||
if ((flags & (FIND_DECLARATIONS)) != 0) {
|
||||
// for decls we do defs too
|
||||
PDOMName name = binding.getFirstDefinition();
|
||||
while (name != null) {
|
||||
IASTFileLocation loc = name.getFileLocation();
|
||||
result.addMatch(new PDOMSearchMatch(name, loc.getNodeOffset(), loc.getNodeLength()));
|
||||
name = name.getNextInBinding();
|
||||
}
|
||||
}
|
||||
if ((flags & FIND_REFERENCES) != 0) {
|
||||
PDOMName name = binding.getFirstReference();
|
||||
while (name != null) {
|
||||
IASTFileLocation loc = name.getFileLocation();
|
||||
result.addMatch(new PDOMSearchMatch(name, loc.getNodeOffset(), loc.getNodeLength()));
|
||||
name = name.getNextInBinding();
|
||||
}
|
||||
}
|
||||
return Status.OK_STATUS;
|
||||
} catch (CoreException e) {
|
||||
return new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, 0, e.getLocalizedMessage(), e);
|
||||
}
|
||||
}
|
||||
|
||||
public String getLabel() {
|
||||
return super.getLabel() + " " + binding.getName();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,523 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2006 QNX Software Systems and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* QNX - Initial API and implementation
|
||||
*******************************************************************************/
|
||||
|
||||
package org.eclipse.cdt.internal.ui.search;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.cdt.core.model.ICElement;
|
||||
import org.eclipse.cdt.internal.ui.ICHelpContextIds;
|
||||
import org.eclipse.cdt.internal.ui.util.RowLayouter;
|
||||
import org.eclipse.cdt.ui.CUIPlugin;
|
||||
import org.eclipse.core.resources.IWorkspace;
|
||||
import org.eclipse.jface.action.IStatusLineManager;
|
||||
import org.eclipse.jface.dialogs.Dialog;
|
||||
import org.eclipse.jface.dialogs.DialogPage;
|
||||
import org.eclipse.jface.dialogs.IDialogSettings;
|
||||
import org.eclipse.jface.text.ITextSelection;
|
||||
import org.eclipse.jface.viewers.ISelection;
|
||||
import org.eclipse.jface.viewers.IStructuredSelection;
|
||||
import org.eclipse.search.ui.ISearchPage;
|
||||
import org.eclipse.search.ui.ISearchPageContainer;
|
||||
import org.eclipse.search.ui.NewSearchUI;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.eclipse.swt.events.ModifyEvent;
|
||||
import org.eclipse.swt.events.ModifyListener;
|
||||
import org.eclipse.swt.events.SelectionAdapter;
|
||||
import org.eclipse.swt.events.SelectionEvent;
|
||||
import org.eclipse.swt.layout.GridData;
|
||||
import org.eclipse.swt.layout.GridLayout;
|
||||
import org.eclipse.swt.widgets.Button;
|
||||
import org.eclipse.swt.widgets.Combo;
|
||||
import org.eclipse.swt.widgets.Composite;
|
||||
import org.eclipse.swt.widgets.Control;
|
||||
import org.eclipse.swt.widgets.Group;
|
||||
import org.eclipse.swt.widgets.Label;
|
||||
import org.eclipse.ui.IEditorSite;
|
||||
import org.eclipse.ui.IViewSite;
|
||||
import org.eclipse.ui.IWorkbenchPage;
|
||||
import org.eclipse.ui.IWorkbenchPartSite;
|
||||
import org.eclipse.ui.IWorkbenchWindow;
|
||||
import org.eclipse.ui.IWorkingSet;
|
||||
import org.eclipse.ui.PlatformUI;
|
||||
|
||||
/**
|
||||
* @author Doug Schaefer
|
||||
*
|
||||
*/
|
||||
public class PDOMSearchPage extends DialogPage implements ISearchPage {
|
||||
|
||||
public static final String EXTENSION_POINT_ID = CUIPlugin.PLUGIN_ID + "pdomSearchPage"; //$NON-NLS-1$
|
||||
|
||||
//Dialog store id constants
|
||||
private final static String PAGE_NAME = "PDOMSearchPage"; //$NON-NLS-1$
|
||||
private final static String STORE_CASE_SENSITIVE = "caseSensitive"; //$NON-NLS-1$
|
||||
private final static String STORE_PREVIOUS_PATTERNS = "previousPatterns"; //$NON-NLS-1$
|
||||
private final static String STORE_SEARCH_FLAGS = "searchFlags"; //$NON-NLS-1$
|
||||
|
||||
/** Preference key for external marker enablement */
|
||||
public final static String EXTERNALMATCH_ENABLED = "externMatchEnable"; //$NON-NLS-1$
|
||||
/** Preference key for external marker visibilty */
|
||||
public final static String EXTERNALMATCH_VISIBLE = "externMatchVisible"; //$NON-NLS-1$
|
||||
|
||||
private static final String[] searchForText= {
|
||||
CSearchMessages.getString("CSearchPage.searchFor.classStruct"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.searchFor.function"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.searchFor.variable"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.searchFor.union"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.searchFor.method"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.searchFor.field"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.searchFor.enum"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.searchFor.enumr"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.searchFor.namespace"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.searchFor.typedef"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.searchFor.macro"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.searchFor.any") //$NON-NLS-1$
|
||||
};
|
||||
|
||||
// These must be in the same order as the Text
|
||||
private static final Integer[] searchForData = {
|
||||
new Integer(PDOMSearchPatternQuery.FIND_CLASS_STRUCT),
|
||||
new Integer(PDOMSearchPatternQuery.FIND_FUNCTION),
|
||||
new Integer(PDOMSearchPatternQuery.FIND_VARIABLE),
|
||||
new Integer(PDOMSearchPatternQuery.FIND_UNION),
|
||||
new Integer(PDOMSearchPatternQuery.FIND_METHOD),
|
||||
new Integer(PDOMSearchPatternQuery.FIND_FIELD),
|
||||
new Integer(PDOMSearchPatternQuery.FIND_ENUM),
|
||||
new Integer(PDOMSearchPatternQuery.FIND_ENUMERATOR),
|
||||
new Integer(PDOMSearchPatternQuery.FIND_NAMESPACE),
|
||||
new Integer(PDOMSearchPatternQuery.FIND_TYPEDEF),
|
||||
new Integer(PDOMSearchPatternQuery.FIND_MACRO),
|
||||
new Integer(PDOMSearchPatternQuery.FIND_ALL_TYPES)
|
||||
};
|
||||
|
||||
// the index of FIND_ALL_TYPES
|
||||
private static final int searchAllButtonIndex = searchForData.length - 1;
|
||||
|
||||
private static String[] limitToText = {
|
||||
CSearchMessages.getString("CSearchPage.limitTo.declarations"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.limitTo.definitions"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.limitTo.references"), //$NON-NLS-1$
|
||||
CSearchMessages.getString("CSearchPage.limitTo.allOccurrences") //$NON-NLS-1$
|
||||
};
|
||||
|
||||
// Must be in the same order as the text
|
||||
private static Integer[] limitToData = {
|
||||
new Integer(PDOMSearchQuery.FIND_DECLARATIONS),
|
||||
new Integer(PDOMSearchQuery.FIND_DEFINITIONS),
|
||||
new Integer(PDOMSearchQuery.FIND_REFERENCES),
|
||||
new Integer(PDOMSearchQuery.FIND_ALL_OCCURANCES),
|
||||
};
|
||||
|
||||
// The index of FIND_ALL_OCCURANCES
|
||||
private static final int limitToAllButtonIndex = limitToData.length - 1;
|
||||
|
||||
private Combo patternCombo;
|
||||
private String[] previousPatterns;
|
||||
private Button caseSensitiveButton;
|
||||
|
||||
private Button[] searchForButtons;
|
||||
private Button[] limitToButtons;
|
||||
|
||||
private boolean firstTime = true;
|
||||
private IStructuredSelection structuredSelection;
|
||||
private ITextSelection textSelection;
|
||||
|
||||
private ISearchPageContainer pageContainer;
|
||||
|
||||
private IStatusLineManager fLineManager;
|
||||
|
||||
public boolean performAction() {
|
||||
fLineManager.setErrorMessage(null);
|
||||
|
||||
boolean isCaseSensitive = caseSensitiveButton.getSelection();
|
||||
|
||||
// get the pattern
|
||||
String pattern = patternCombo.getText();
|
||||
|
||||
// Get search flags
|
||||
int searchFlags = 0;
|
||||
if (searchForButtons[searchAllButtonIndex].getSelection())
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_ALL_TYPES;
|
||||
else {
|
||||
for (int i = 0; i < searchForButtons.length; ++i) {
|
||||
if (searchForButtons[i].getSelection())
|
||||
searchFlags |= ((Integer)searchForButtons[i].getData()).intValue();
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < limitToButtons.length; ++i) {
|
||||
if (limitToButtons[i].getSelection())
|
||||
searchFlags |= ((Integer)limitToButtons[i].getData()).intValue();
|
||||
}
|
||||
|
||||
// get the list of elements for the scope
|
||||
List elements = new ArrayList();
|
||||
String scopeDescription = ""; //$NON-NLS-1$
|
||||
IWorkspace workspace = CUIPlugin.getWorkspace();
|
||||
switch( getContainer().getSelectedScope() ) {
|
||||
case ISearchPageContainer.SELECTED_PROJECTS_SCOPE:
|
||||
if( structuredSelection != null && structuredSelection.iterator().hasNext() ){
|
||||
scopeDescription = CSearchMessages.getString("ProjectScope"); //$NON-NLS-1$
|
||||
|
||||
}
|
||||
break;
|
||||
|
||||
case ISearchPageContainer.SELECTION_SCOPE:
|
||||
if( structuredSelection != null && structuredSelection.iterator().hasNext() ){
|
||||
scopeDescription = CSearchMessages.getString("SelectionScope"); //$NON-NLS-1$
|
||||
break;
|
||||
}
|
||||
/* else fall through to workspace scope */
|
||||
case ISearchPageContainer.WORKSPACE_SCOPE:
|
||||
scopeDescription = CSearchMessages.getString("WorkspaceScope"); //$NON-NLS-1$
|
||||
// fall through and use the workspace scope below
|
||||
break;
|
||||
case ISearchPageContainer.WORKING_SET_SCOPE:
|
||||
IWorkingSet[] workingSets= getContainer().getSelectedWorkingSets();
|
||||
// should not happen - just to be sure
|
||||
if (workingSets == null || workingSets.length < 1)
|
||||
return false;
|
||||
scopeDescription = CSearchMessages.getFormattedString("WorkingSetScope", CSearchUtil.toString(workingSets)); //$NON-NLS-1$
|
||||
CSearchUtil.updateLRUWorkingSets(getContainer().getSelectedWorkingSets());
|
||||
}
|
||||
|
||||
if (elements.isEmpty()) {
|
||||
// default to workspace scope
|
||||
}
|
||||
|
||||
ICElement[] scope = (ICElement[])elements.toArray(new ICElement[elements.size()]);
|
||||
PDOMSearchPatternQuery job = new PDOMSearchPatternQuery(scope, scopeDescription, pattern, searchFlags);
|
||||
|
||||
NewSearchUI.activateSearchResultView();
|
||||
|
||||
NewSearchUI.runQueryInBackground(job);
|
||||
|
||||
// Save our settings
|
||||
IDialogSettings settings = getDialogSettings();
|
||||
settings.put(STORE_CASE_SENSITIVE, isCaseSensitive);
|
||||
|
||||
if (previousPatterns != null)
|
||||
settings.put(STORE_PREVIOUS_PATTERNS, previousPatterns);
|
||||
|
||||
settings.put(STORE_SEARCH_FLAGS, searchFlags);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public void createControl(Composite parent) {
|
||||
initializeDialogUnits( parent );
|
||||
|
||||
GridData gd;
|
||||
Composite result = new Composite( parent, SWT.NONE );
|
||||
GridLayout layout = new GridLayout( 2, false );
|
||||
layout.horizontalSpacing = 10;
|
||||
result.setLayout( layout );
|
||||
result.setLayoutData( new GridData(GridData.FILL_HORIZONTAL) );
|
||||
|
||||
RowLayouter layouter = new RowLayouter( layout.numColumns );
|
||||
gd = new GridData();
|
||||
gd.horizontalAlignment = GridData.FILL;
|
||||
gd.verticalAlignment = GridData.VERTICAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_FILL;
|
||||
|
||||
layouter.setDefaultGridData( gd, 0 );
|
||||
layouter.setDefaultGridData( gd, 1 );
|
||||
layouter.setDefaultSpan();
|
||||
|
||||
layouter.perform( createExpression(result) );
|
||||
layouter.perform( createSearchFor(result), createLimitTo(result), -1 );
|
||||
|
||||
setControl( result );
|
||||
|
||||
fLineManager = getStatusLineManager();
|
||||
|
||||
Dialog.applyDialogFont( result );
|
||||
PlatformUI.getWorkbench().getHelpSystem().setHelp(result, ICHelpContextIds.C_SEARCH_PAGE);
|
||||
}
|
||||
|
||||
private IStatusLineManager getStatusLineManager(){
|
||||
|
||||
IWorkbenchWindow wbWindow= PlatformUI.getWorkbench().getActiveWorkbenchWindow();
|
||||
if (wbWindow != null) {
|
||||
IWorkbenchPage page= wbWindow.getActivePage();
|
||||
if (page != null) {
|
||||
IWorkbenchPartSite workbenchSite = page.getActivePart().getSite();
|
||||
if (workbenchSite instanceof IViewSite){
|
||||
return ((IViewSite) workbenchSite).getActionBars().getStatusLineManager();
|
||||
}
|
||||
else if (workbenchSite instanceof IEditorSite){
|
||||
return ((IEditorSite) workbenchSite).getActionBars().getStatusLineManager();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private Control createExpression( Composite parent ) {
|
||||
Composite result = new Composite(parent, SWT.NONE);
|
||||
GridLayout layout = new GridLayout(2, false);
|
||||
result.setLayout(layout);
|
||||
GridData gd = new GridData( GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL );
|
||||
gd.horizontalSpan = 2;
|
||||
gd.horizontalIndent = 0;
|
||||
result.setLayoutData( gd );
|
||||
|
||||
// Pattern text + info
|
||||
Label label = new Label( result, SWT.LEFT );
|
||||
label.setText( CSearchMessages.getString( "CSearchPage.expression.label" ) ); //$NON-NLS-1$
|
||||
gd = new GridData( GridData.BEGINNING );
|
||||
gd.horizontalSpan = 2;
|
||||
label.setLayoutData( gd );
|
||||
|
||||
// Pattern combo
|
||||
patternCombo = new Combo( result, SWT.SINGLE | SWT.BORDER );
|
||||
patternCombo.addSelectionListener( new SelectionAdapter() {
|
||||
public void widgetSelected( SelectionEvent e ) {
|
||||
//handlePatternSelected();
|
||||
}
|
||||
});
|
||||
|
||||
patternCombo.addModifyListener( new ModifyListener() {
|
||||
public void modifyText( ModifyEvent e ) {
|
||||
setPerformActionEnabled();
|
||||
}
|
||||
});
|
||||
|
||||
gd = new GridData( GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL );
|
||||
gd.horizontalIndent = -gd.horizontalIndent;
|
||||
patternCombo.setLayoutData( gd );
|
||||
|
||||
|
||||
// Ignore case checkbox
|
||||
caseSensitiveButton= new Button(result, SWT.CHECK);
|
||||
caseSensitiveButton.setText(CSearchMessages.getString("CSearchPage.expression.caseSensitive")); //$NON-NLS-1$
|
||||
gd= new GridData();
|
||||
caseSensitiveButton.setLayoutData(gd);
|
||||
caseSensitiveButton.addSelectionListener( new SelectionAdapter() {
|
||||
public void widgetSelected( SelectionEvent e ) {
|
||||
// isCaseSensitive = caseSensitiveButton.getSelection();
|
||||
setPerformActionEnabled();
|
||||
}
|
||||
});
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private Control createLimitTo( Composite parent ) {
|
||||
Group result = new Group(parent, SWT.NONE);
|
||||
result.setText( CSearchMessages.getString("CSearchPage.limitTo.label") ); //$NON-NLS-1$
|
||||
GridLayout layout = new GridLayout();
|
||||
layout.numColumns = 2;
|
||||
result.setLayout( layout );
|
||||
|
||||
limitToButtons = new Button[limitToText.length];
|
||||
for( int i = 0; i < limitToText.length; i++ ){
|
||||
Button button = new Button(result, SWT.RADIO);
|
||||
button.setText( limitToText[i] );
|
||||
button.setData( limitToData[i] );
|
||||
limitToButtons[i] = button;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private Control createSearchFor(Composite parent) {
|
||||
Group result= new Group(parent, SWT.NONE);
|
||||
result.setText(CSearchMessages.getString("CSearchPage.searchFor.label")); //$NON-NLS-1$
|
||||
GridLayout layout= new GridLayout();
|
||||
layout.numColumns= 3;
|
||||
result.setLayout(layout);
|
||||
|
||||
SelectionAdapter searchForSelectionAdapter = new SelectionAdapter() {
|
||||
public void widgetSelected(SelectionEvent event) {
|
||||
Button me = (Button)event.widget;
|
||||
if (me == searchForButtons[searchAllButtonIndex]) {
|
||||
if (me.getSelection()) {
|
||||
for (int i = 0; i < searchForButtons.length; ++i) {
|
||||
if (i != searchAllButtonIndex) {
|
||||
searchForButtons[i].setSelection(true);
|
||||
searchForButtons[i].setEnabled(false);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for (int i = 0; i < searchForButtons.length; ++i) {
|
||||
if (i != searchAllButtonIndex) {
|
||||
searchForButtons[i].setSelection(false);
|
||||
searchForButtons[i].setEnabled(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
setPerformActionEnabled();
|
||||
}
|
||||
};
|
||||
|
||||
searchForButtons= new Button[searchForText.length];
|
||||
for (int i= 0; i < searchForText.length; i++) {
|
||||
Button button= new Button(result, SWT.CHECK);
|
||||
button.setText(searchForText[i]);
|
||||
button.setData(searchForData[i]);
|
||||
button.addSelectionListener(searchForSelectionAdapter);
|
||||
searchForButtons[i]= button;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public void setContainer(ISearchPageContainer container) {
|
||||
pageContainer = container;
|
||||
}
|
||||
|
||||
private ISearchPageContainer getContainer() {
|
||||
return pageContainer;
|
||||
}
|
||||
|
||||
private void setPerformActionEnabled() {
|
||||
boolean enable = true;
|
||||
|
||||
// Need a text string to search
|
||||
if (patternCombo.getText().length() == 0)
|
||||
enable = false;
|
||||
|
||||
// Need a type
|
||||
boolean any = false;
|
||||
for (int i = 0; i < searchForButtons.length; ++i)
|
||||
if (searchForButtons[i].getSelection()) {
|
||||
any = true;
|
||||
break;
|
||||
}
|
||||
if (!any)
|
||||
enable = false;
|
||||
|
||||
getContainer().setPerformActionEnabled(enable);
|
||||
}
|
||||
|
||||
private IDialogSettings getDialogSettings() {
|
||||
IDialogSettings settings = CUIPlugin.getDefault().getDialogSettings();
|
||||
IDialogSettings searchSettings = settings.getSection( PAGE_NAME );
|
||||
if( searchSettings == null )
|
||||
searchSettings = settings.addNewSection( PAGE_NAME );
|
||||
return searchSettings;
|
||||
}
|
||||
|
||||
public void setVisible(boolean visible) {
|
||||
if (visible) {
|
||||
if (firstTime) {
|
||||
firstTime= false;
|
||||
|
||||
IDialogSettings settings = getDialogSettings();
|
||||
|
||||
int searchFlags = PDOMSearchPatternQuery.FIND_ALL_TYPES | PDOMSearchPatternQuery.FIND_ALL_OCCURANCES;
|
||||
try {
|
||||
searchFlags = settings.getInt(STORE_SEARCH_FLAGS);
|
||||
} catch (NumberFormatException e) {
|
||||
// Int was unitialized, assume the defaults
|
||||
}
|
||||
|
||||
// Initialize the selection
|
||||
ISelection selection = getContainer().getSelection();
|
||||
if (selection instanceof IStructuredSelection) {
|
||||
structuredSelection = (IStructuredSelection)selection;
|
||||
Object obj = structuredSelection.getFirstElement();
|
||||
if (obj instanceof ICElement) {
|
||||
ICElement element = (ICElement)obj;
|
||||
patternCombo.setText(element.getElementName());
|
||||
// Clear the type flags so we can set them correctly for what we have selected
|
||||
searchFlags = searchFlags & ~PDOMSearchPatternQuery.FIND_ALL_TYPES;
|
||||
switch (element.getElementType()) {
|
||||
case ICElement.C_CLASS:
|
||||
case ICElement.C_STRUCT:
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_CLASS_STRUCT;
|
||||
break;
|
||||
case ICElement.C_FUNCTION:
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_FUNCTION;
|
||||
break;
|
||||
case ICElement.C_VARIABLE:
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_VARIABLE;
|
||||
break;
|
||||
case ICElement.C_UNION:
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_UNION;
|
||||
break;
|
||||
case ICElement.C_METHOD:
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_METHOD;
|
||||
break;
|
||||
case ICElement.C_FIELD:
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_FIELD;
|
||||
break;
|
||||
case ICElement.C_ENUMERATION:
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_ENUM;
|
||||
break;
|
||||
case ICElement.C_ENUMERATOR:
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_ENUMERATOR;
|
||||
break;
|
||||
case ICElement.C_NAMESPACE:
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_NAMESPACE;
|
||||
break;
|
||||
case ICElement.C_TYPEDEF:
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_TYPEDEF;
|
||||
break;
|
||||
case ICElement.C_MACRO:
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_MACRO;
|
||||
break;
|
||||
default:
|
||||
// Not sure, set to all
|
||||
searchFlags |= PDOMSearchPatternQuery.FIND_ALL_TYPES;
|
||||
}
|
||||
}
|
||||
} else if (selection instanceof ITextSelection) {
|
||||
textSelection = (ITextSelection)selection;
|
||||
patternCombo.setText(textSelection.getText());
|
||||
// TODO it might be good to do a selection parse to ensure that
|
||||
// the selection is valid.
|
||||
}
|
||||
|
||||
String[] previousPatterns = settings.getArray(STORE_PREVIOUS_PATTERNS);
|
||||
if (previousPatterns != null)
|
||||
patternCombo.setItems(previousPatterns);
|
||||
caseSensitiveButton.setSelection(settings.getBoolean(STORE_CASE_SENSITIVE));
|
||||
|
||||
if ((searchFlags & PDOMSearchPatternQuery.FIND_ALL_TYPES) == PDOMSearchPatternQuery.FIND_ALL_TYPES) {
|
||||
searchForButtons[searchAllButtonIndex].setSelection(true);
|
||||
for (int i = 0; i < searchForButtons.length; ++i) {
|
||||
if (i != searchAllButtonIndex) {
|
||||
searchForButtons[i].setSelection(true);
|
||||
searchForButtons[i].setEnabled(false);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
searchForButtons[searchAllButtonIndex].setSelection(false);
|
||||
for (int i = 0; i < searchForButtons.length; ++i) {
|
||||
if (i != searchAllButtonIndex) {
|
||||
searchForButtons[i].setSelection(
|
||||
(searchFlags & ((Integer)searchForButtons[i].getData()).intValue()) != 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((searchFlags & PDOMSearchPatternQuery.FIND_ALL_OCCURANCES) == PDOMSearchPatternQuery.FIND_ALL_OCCURANCES) {
|
||||
limitToButtons[limitToAllButtonIndex].setSelection(true);
|
||||
} else {
|
||||
limitToButtons[limitToAllButtonIndex].setSelection(false);
|
||||
for (int i = 0; i < limitToButtons.length - 2; ++i) {
|
||||
limitToButtons[i].setSelection(
|
||||
(searchFlags & ((Integer)limitToButtons[i].getData()).intValue()) != 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
patternCombo.setFocus();
|
||||
setPerformActionEnabled();
|
||||
}
|
||||
super.setVisible(visible);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2006 QNX Software Systems and others.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the Eclipse Public License v1.0
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.eclipse.org/legal/epl-v10.html
|
||||
*
|
||||
* Contributors:
|
||||
* QNX - Initial API and implementation
|
||||
*******************************************************************************/
|
||||
|
||||
package org.eclipse.cdt.internal.ui.search;
|
||||
|
||||
import org.eclipse.cdt.core.model.ICElement;
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.core.runtime.IStatus;
|
||||
import org.eclipse.core.runtime.OperationCanceledException;
|
||||
import org.eclipse.core.runtime.Status;
|
||||
|
||||
/**
|
||||
* @author Doug Schaefer
|
||||
*
|
||||
*/
|
||||
public class PDOMSearchPatternQuery extends PDOMSearchQuery {
|
||||
|
||||
// First bit after the FINDs in PDOMSearchQuery.
|
||||
public static final int FIND_CLASS_STRUCT = 0x10;
|
||||
public static final int FIND_FUNCTION = 0x20;
|
||||
public static final int FIND_VARIABLE = 0x40;
|
||||
public static final int FIND_UNION = 0x100;
|
||||
public static final int FIND_METHOD = 0x200;
|
||||
public static final int FIND_FIELD = 0x400;
|
||||
public static final int FIND_ENUM = 0x1000;
|
||||
public static final int FIND_ENUMERATOR = 0x2000;
|
||||
public static final int FIND_NAMESPACE = 0x4000;
|
||||
public static final int FIND_TYPEDEF = 0x10000;
|
||||
public static final int FIND_MACRO = 0x20000;
|
||||
public static final int FIND_ALL_TYPES
|
||||
= FIND_CLASS_STRUCT | FIND_FUNCTION | FIND_VARIABLE
|
||||
| FIND_UNION | FIND_METHOD | FIND_FIELD | FIND_ENUM
|
||||
| FIND_ENUMERATOR | FIND_NAMESPACE | FIND_TYPEDEF | FIND_MACRO;
|
||||
|
||||
private ICElement[] scope;
|
||||
private String pattern;
|
||||
|
||||
public PDOMSearchPatternQuery(
|
||||
ICElement[] scope,
|
||||
String scopeDesc,
|
||||
String pattern,
|
||||
int flags) {
|
||||
super(flags);
|
||||
this.scope = scope;
|
||||
this.pattern = pattern;
|
||||
}
|
||||
|
||||
public IStatus run(IProgressMonitor monitor) throws OperationCanceledException {
|
||||
// TODO Auto-generated method stub
|
||||
return Status.OK_STATUS;
|
||||
}
|
||||
|
||||
public String getLabel() {
|
||||
return super.getLabel() + " " + pattern;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -11,81 +11,36 @@
|
|||
|
||||
package org.eclipse.cdt.internal.ui.search;
|
||||
|
||||
import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
|
||||
import org.eclipse.cdt.internal.core.pdom.dom.PDOMBinding;
|
||||
import org.eclipse.cdt.internal.core.pdom.dom.PDOMName;
|
||||
import org.eclipse.cdt.ui.CUIPlugin;
|
||||
import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.core.runtime.IProgressMonitor;
|
||||
import org.eclipse.core.runtime.IStatus;
|
||||
import org.eclipse.core.runtime.OperationCanceledException;
|
||||
import org.eclipse.core.runtime.Status;
|
||||
import org.eclipse.search.ui.ISearchQuery;
|
||||
import org.eclipse.search.ui.ISearchResult;
|
||||
|
||||
/**
|
||||
* @author Doug Schaefer
|
||||
*
|
||||
* This is the search query to be used for searching the PDOM.
|
||||
*
|
||||
*/
|
||||
public class PDOMSearchQuery implements ISearchQuery {
|
||||
public abstract class PDOMSearchQuery implements ISearchQuery {
|
||||
|
||||
public static final int FIND_DECLARATIONS = 1;
|
||||
public static final int FIND_DEFINITIONS = 2;
|
||||
public static final int FIND_REFERENCES = 4;
|
||||
public static final int FIND_DECLARATIONS = 0x1;
|
||||
public static final int FIND_DEFINITIONS = 0x2;
|
||||
public static final int FIND_REFERENCES = 0x4;
|
||||
public static final int FIND_ALL_OCCURANCES = FIND_DECLARATIONS | FIND_DEFINITIONS | FIND_REFERENCES;
|
||||
|
||||
private PDOMSearchResult result = new PDOMSearchResult(this);
|
||||
private PDOMBinding binding;
|
||||
private int flags;
|
||||
|
||||
public PDOMSearchQuery(PDOMBinding binding, int flags) {
|
||||
this.binding = binding;
|
||||
protected PDOMSearchResult result = new PDOMSearchResult(this);
|
||||
protected int flags;
|
||||
|
||||
protected PDOMSearchQuery(int flags) {
|
||||
this.flags = flags;
|
||||
}
|
||||
|
||||
public IStatus run(IProgressMonitor monitor) throws OperationCanceledException {
|
||||
try {
|
||||
if ((flags & FIND_DECLARATIONS) != 0) {
|
||||
PDOMName name = binding.getFirstDeclaration();
|
||||
while (name != null) {
|
||||
IASTFileLocation loc = name.getFileLocation();
|
||||
result.addMatch(new PDOMSearchMatch(name, loc.getNodeOffset(), loc.getNodeLength()));
|
||||
name = name.getNextInBinding();
|
||||
}
|
||||
}
|
||||
if ((flags & (FIND_DECLARATIONS)) != 0) {
|
||||
// for decls we do defs too
|
||||
PDOMName name = binding.getFirstDefinition();
|
||||
while (name != null) {
|
||||
IASTFileLocation loc = name.getFileLocation();
|
||||
result.addMatch(new PDOMSearchMatch(name, loc.getNodeOffset(), loc.getNodeLength()));
|
||||
name = name.getNextInBinding();
|
||||
}
|
||||
}
|
||||
if ((flags & FIND_REFERENCES) != 0) {
|
||||
PDOMName name = binding.getFirstReference();
|
||||
while (name != null) {
|
||||
IASTFileLocation loc = name.getFileLocation();
|
||||
result.addMatch(new PDOMSearchMatch(name, loc.getNodeOffset(), loc.getNodeLength()));
|
||||
name = name.getNextInBinding();
|
||||
}
|
||||
}
|
||||
return Status.OK_STATUS;
|
||||
} catch (CoreException e) {
|
||||
return new Status(IStatus.ERROR, CUIPlugin.PLUGIN_ID, 0, e.getLocalizedMessage(), e);
|
||||
}
|
||||
}
|
||||
|
||||
public String getLabel() {
|
||||
String type = null;
|
||||
String type;
|
||||
if ((flags & FIND_REFERENCES) != 0)
|
||||
type = CSearchMessages.getString("PDOMSearch.query.refs.label"); //$NON-NLS-1$
|
||||
else if ((flags & FIND_DECLARATIONS) != 0)
|
||||
type = CSearchMessages.getString("PDOMSearch.query.decls.label"); //$NON-NLS-1$
|
||||
else
|
||||
type = CSearchMessages.getString("PDOMSearch.query.defs.label"); //$NON-NLS-1$
|
||||
|
||||
return type + " " + binding.getName();
|
||||
return type;
|
||||
}
|
||||
|
||||
public boolean canRerun() {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue