mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-07 17:56:01 +02:00
Changed return type of CEditor.getInputCElement to be IWorkingCopy. The
method already returned a working copy before this change but it was implicit.
This commit is contained in:
parent
5bf7b89b5f
commit
344f3979de
1 changed files with 7 additions and 7 deletions
|
@ -1609,12 +1609,12 @@ public class CEditor extends TextEditor implements ICEditor, ISelectionChangedLi
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the C element wrapped by this editors input.
|
* Returns the working copy wrapped by this editors input.
|
||||||
*
|
*
|
||||||
* @return the C element wrapped by this editors input.
|
* @return the working copy wrapped by this editors input.
|
||||||
* @since 3.0
|
* @since 3.0
|
||||||
*/
|
*/
|
||||||
public ICElement getInputCElement () {
|
public IWorkingCopy getInputCElement () {
|
||||||
return CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(getEditorInput());
|
return CUIPlugin.getDefault().getWorkingCopyManager().getWorkingCopy(getEditorInput());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1950,13 +1950,13 @@ public class CEditor extends TextEditor implements ICEditor, ISelectionChangedLi
|
||||||
* @return the most narrow element which includes the given offset
|
* @return the most narrow element which includes the given offset
|
||||||
*/
|
*/
|
||||||
protected ICElement getElementAt(int offset, boolean reconcile) {
|
protected ICElement getElementAt(int offset, boolean reconcile) {
|
||||||
ITranslationUnit unit= (ITranslationUnit) getInputCElement();
|
IWorkingCopy unit= getInputCElement();
|
||||||
|
|
||||||
if (unit != null) {
|
if (unit != null) {
|
||||||
try {
|
try {
|
||||||
if (reconcile && unit instanceof IWorkingCopy) {
|
if (reconcile) {
|
||||||
synchronized (unit) {
|
synchronized (unit) {
|
||||||
((IWorkingCopy) unit).reconcile();
|
unit.reconcile();
|
||||||
}
|
}
|
||||||
return unit.getElementAtOffset(offset);
|
return unit.getElementAtOffset(offset);
|
||||||
} else if (unit.isStructureKnown() && unit.isConsistent() && !fIsReconciling) {
|
} else if (unit.isStructureKnown() && unit.isConsistent() && !fIsReconciling) {
|
||||||
|
@ -1964,7 +1964,7 @@ public class CEditor extends TextEditor implements ICEditor, ISelectionChangedLi
|
||||||
}
|
}
|
||||||
} catch (CModelException x) {
|
} catch (CModelException x) {
|
||||||
CUIPlugin.log(x.getStatus());
|
CUIPlugin.log(x.getStatus());
|
||||||
// nothing found, be tolerant and go on
|
// Nothing found, be tolerant and go on.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue