mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-21 21:52:10 +02:00
Code Issues Wiki Activity

Sort external translation units by name

Browse source
This commit is contained in:
John Dallaway 2023-10-09 17:56:08 +01:00
parent 48df0ae2dc
commit e1a8c4683a
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CElementSorter.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2005, 2015 IBM Corporation and others. * Copyright (c) 2005, 2023 IBM Corporation and others.
* *
* This program and the accompanying materials * This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0 * are made available under the terms of the Eclipse Public License 2.0
@ -13,6 +13,7 @@
* QNX Software System * QNX Software System
* Anton Leherbauer (Wind River Systems) * Anton Leherbauer (Wind River Systems)
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
* John Dallaway - sort external translation units by name (#563)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.ui; package org.eclipse.cdt.ui;
@ -28,6 +29,7 @@ import org.eclipse.cdt.core.model.ILibraryReference;
import org.eclipse.cdt.core.model.IMember; import org.eclipse.cdt.core.model.IMember;
import org.eclipse.cdt.core.model.IMethodDeclaration; import org.eclipse.cdt.core.model.IMethodDeclaration;
import org.eclipse.cdt.core.model.ISourceRoot; import org.eclipse.cdt.core.model.ISourceRoot;
import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IStorage; import org.eclipse.core.resources.IStorage;
@ -316,7 +318,11 @@ public class CElementSorter extends ViewerSorter {
String name1; String name1;
String name2; String name2;
if (e1 instanceof ICElement) { if ((e1 instanceof ITranslationUnit tu) && (null == tu.getResource())) {
// an external translation unit - sort by filename only (not path)
IPath location = tu.getLocation();
name1 = (null == location) ? tu.getElementName() : location.lastSegment();
} else if (e1 instanceof ICElement) {
name1 = ((ICElement) e1).getElementName(); name1 = ((ICElement) e1).getElementName();
int idx = name1.lastIndexOf("::"); //$NON-NLS-1$ int idx = name1.lastIndexOf("::"); //$NON-NLS-1$
if (idx >= 0) { if (idx >= 0) {
@ -331,7 +337,11 @@ public class CElementSorter extends ViewerSorter {
} else { } else {
name1 = e1.toString(); name1 = e1.toString();
} }
if (e2 instanceof ICElement) { if ((e2 instanceof ITranslationUnit tu) && (null == tu.getResource())) {
// an external translation unit - sort by filename only (not path)
IPath location = tu.getLocation();
name2 = (null == location) ? tu.getElementName() : location.lastSegment();
} else if (e2 instanceof ICElement) {
name2 = ((ICElement) e2).getElementName(); name2 = ((ICElement) e2).getElementName();
int idx = name2.lastIndexOf("::"); //$NON-NLS-1$ int idx = name2.lastIndexOf("::"); //$NON-NLS-1$
if (idx >= 0) { if (idx >= 0) {