Improves profiling rendering

Change-Id: I76d1e06b266c51a92afcfbaee2396f442a458c11
eclipse-acceleo · Feb 20, 2023 · de20428 · de20428
1 parent 2b50a14
commit de20428
Show file tree

Hide file tree

Showing 56 changed files with 10 additions and 24 deletions.
diff --git a/...celeo.aql.ls.profile/src/org/eclipse/acceleo/aql/ls/profile/AcceleoProfilerEvaluator.java b/...celeo.aql.ls.profile/src/org/eclipse/acceleo/aql/ls/profile/AcceleoProfilerEvaluator.java
@@ -1,5 +1,7 @@
 package org.eclipse.acceleo.aql.ls.profile;
 
+import org.eclipse.acceleo.Block;
+import org.eclipse.acceleo.ExpressionStatement;
 import org.eclipse.acceleo.TextStatement;
 import org.eclipse.acceleo.aql.IAcceleoEnvironment;
 import org.eclipse.acceleo.aql.evaluation.AcceleoEvaluator;
@@ -58,6 +60,7 @@ public Object doSwitch(EObject eObject) {
 	 * @return <true> if the element must not appear in the profiling result.
 	 */
 	private boolean filter(EObject eObject) {
-		return eObject instanceof TextStatement;
+		return eObject instanceof TextStatement || eObject instanceof ExpressionStatement
+				|| eObject instanceof Block;
 	}
 }
diff --git a/plugins/org.eclipse.acceleo.aql.profiler.edit/.gitignore b/plugins/org.eclipse.acceleo.aql.profiler.edit/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/plugins/org.eclipse.acceleo.aql.profiler.edit/bin/.gitignore b/plugins/org.eclipse.acceleo.aql.profiler.edit/bin/.gitignore
diff --git a/...ql.profiler.edit/bin/org/eclipse/acceleo/aql/profiler/provider/InternalItemProvider.class b/...ql.profiler.edit/bin/org/eclipse/acceleo/aql/profiler/provider/InternalItemProvider.class
diff --git a/...ler.edit/bin/org/eclipse/acceleo/aql/profiler/provider/LoopProfileEntryItemProvider.class b/...ler.edit/bin/org/eclipse/acceleo/aql/profiler/provider/LoopProfileEntryItemProvider.class
diff --git a/...edit/bin/org/eclipse/acceleo/aql/profiler/provider/LoopProfileEntryItemProviderSpec.class b/...edit/bin/org/eclipse/acceleo/aql/profiler/provider/LoopProfileEntryItemProviderSpec.class
diff --git a/...rofiler.edit/bin/org/eclipse/acceleo/aql/profiler/provider/ProfileEntryItemProvider.class b/...rofiler.edit/bin/org/eclipse/acceleo/aql/profiler/provider/ProfileEntryItemProvider.class
diff --git a/...ler.edit/bin/org/eclipse/acceleo/aql/profiler/provider/ProfileEntryItemProviderSpec.class b/...ler.edit/bin/org/eclipse/acceleo/aql/profiler/provider/ProfileEntryItemProviderSpec.class
diff --git a/...iler.edit/bin/org/eclipse/acceleo/aql/profiler/provider/ProfileResourceItemProvider.class b/...iler.edit/bin/org/eclipse/acceleo/aql/profiler/provider/ProfileResourceItemProvider.class
diff --git a/...dit/bin/org/eclipse/acceleo/aql/profiler/provider/ProfilerEditPlugin$Implementation.class b/...dit/bin/org/eclipse/acceleo/aql/profiler/provider/ProfilerEditPlugin$Implementation.class
diff --git a/....aql.profiler.edit/bin/org/eclipse/acceleo/aql/profiler/provider/ProfilerEditPlugin.class b/....aql.profiler.edit/bin/org/eclipse/acceleo/aql/profiler/provider/ProfilerEditPlugin.class
diff --git a/...it/bin/org/eclipse/acceleo/aql/profiler/provider/ProfilerItemProviderAdapterFactory.class b/...it/bin/org/eclipse/acceleo/aql/profiler/provider/ProfilerItemProviderAdapterFactory.class
diff --git a/...in/org/eclipse/acceleo/aql/profiler/provider/ProfilerItemProviderAdapterFactorySpec.class b/...in/org/eclipse/acceleo/aql/profiler/provider/ProfilerItemProviderAdapterFactorySpec.class
diff --git a/....edit/src/org/eclipse/acceleo/aql/profiler/provider/LoopProfileEntryItemProviderSpec.java b/....edit/src/org/eclipse/acceleo/aql/profiler/provider/LoopProfileEntryItemProviderSpec.java
@@ -14,8 +14,6 @@
 import java.text.NumberFormat;
 
 import org.eclipse.acceleo.aql.profiler.LoopProfileEntry;
-import org.eclipse.acceleo.aql.profiler.provider.LoopProfileEntryItemProvider;
-import org.eclipse.acceleo.aql.profiler.provider.ProfilerEditPlugin;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.ecore.EObject;
 
@@ -62,7 +60,7 @@ public String getText(Object object) {
 		format.setMaximumFractionDigits(2);
 
 		return format.format(loopProfileEntry.getPercentage()) + "% / " + loopProfileEntry.getDuration() //$NON-NLS-1$
-				+ "ms / " + loopProfileEntry.getCount() + " times [" //$NON-NLS-1$ //$NON-NLS-2$
+				+ "ms / " + loopProfileEntry.getCount() + " times " + monitored.eClass().getName() + " [" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				+ ProfilerEditPlugin.LABEL_PROVIDER.getText(monitored) + "]"; //$NON-NLS-1$
 	}
 }
diff --git a/...iler.edit/src/org/eclipse/acceleo/aql/profiler/provider/ProfileEntryItemProviderSpec.java b/...iler.edit/src/org/eclipse/acceleo/aql/profiler/provider/ProfileEntryItemProviderSpec.java
@@ -14,8 +14,6 @@
 import java.text.NumberFormat;
 
 import org.eclipse.acceleo.aql.profiler.ProfileEntry;
-import org.eclipse.acceleo.aql.profiler.provider.ProfileEntryItemProvider;
-import org.eclipse.acceleo.aql.profiler.provider.ProfilerEditPlugin;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.ecore.EObject;
 
@@ -62,7 +60,7 @@ public String getText(Object object) {
 		format.setMaximumFractionDigits(2);
 
 		return format.format(profileEntry.getPercentage()) + "% / " + profileEntry.getDuration() + "ms / " //$NON-NLS-1$ //$NON-NLS-2$
-				+ profileEntry.getCount() + " times [" + ProfilerEditPlugin.LABEL_PROVIDER.getText(monitored) //$NON-NLS-1$
-				+ "]"; //$NON-NLS-1$
+				+ profileEntry.getCount() + " times " + monitored.eClass().getName() + " [" //$NON-NLS-1$ //$NON-NLS-2$
+				+ ProfilerEditPlugin.LABEL_PROVIDER.getText(monitored) + "]"; //$NON-NLS-1$
 	}
 }
diff --git a/plugins/org.eclipse.acceleo.aql.profiler.editor/.gitignore b/plugins/org.eclipse.acceleo.aql.profiler.editor/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/plugins/org.eclipse.acceleo.aql.profiler.editor/bin/.gitignore b/plugins/org.eclipse.acceleo.aql.profiler.editor/bin/.gitignore
diff --git a/...ofiler.editor/bin/org/eclipse/acceleo/aql/profiler/editor/AcceleoEnvResourceFactory.class b/...ofiler.editor/bin/org/eclipse/acceleo/aql/profiler/editor/AcceleoEnvResourceFactory.class
diff --git a/...er.editor/bin/org/eclipse/acceleo/aql/profiler/editor/AcceleoProfilerEditorMessages.class b/...er.editor/bin/org/eclipse/acceleo/aql/profiler/editor/AcceleoProfilerEditorMessages.class
diff --git a/...itor/bin/org/eclipse/acceleo/aql/profiler/editor/acceleoprofilereditormessages.properties b/...itor/bin/org/eclipse/acceleo/aql/profiler/editor/acceleoprofilereditormessages.properties
diff --git a/...itor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerActionBarContributor.class b/...itor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerActionBarContributor.class
diff --git a/....profiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor$1.class b/....profiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor$1.class
diff --git a/.../org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor$1MyContentOutlinePage.class b/.../org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor$1MyContentOutlinePage.class
diff --git a/....profiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor$2.class b/....profiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor$2.class
diff --git a/....profiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor$3.class b/....profiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor$3.class
diff --git a/....profiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor$4.class b/....profiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor$4.class
diff --git a/...bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor$ChangementListener.class b/...bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor$ChangementListener.class
diff --git a/...ql.profiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor.class b/...ql.profiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditor.class
diff --git a/...n/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditorPlugin$Implementation.class b/...n/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditorPlugin$Implementation.class
diff --git a/...filer.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditorPlugin.class b/...filer.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerEditorPlugin.class
diff --git a/.../bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerOutlineContentProvider$1.class b/.../bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerOutlineContentProvider$1.class
diff --git a/...or/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerOutlineContentProvider.class b/...or/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerOutlineContentProvider.class
diff --git a/...rofiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerSortAction.class b/...rofiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerSortAction.class
diff --git a/...rofiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerSortStatus.class b/...rofiler.editor/bin/org/eclipse/acceleo/aql/profiler/presentation/ProfilerSortStatus.class
diff --git a/plugins/org.eclipse.acceleo.aql.profiler/.gitignore b/plugins/org.eclipse.acceleo.aql.profiler/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/plugins/org.eclipse.acceleo.aql.profiler/bin/.gitignore b/plugins/org.eclipse.acceleo.aql.profiler/bin/.gitignore
diff --git a/plugins/org.eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/Internal.class b/plugins/org.eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/Internal.class
diff --git a/....eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/LoopProfileEntry.class b/....eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/LoopProfileEntry.class
diff --git a/.../org.eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/ProfileEntry.class b/.../org.eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/ProfileEntry.class
diff --git a/...g.eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/ProfileResource.class b/...g.eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/ProfileResource.class
diff --git a/....eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/Profiler$Context.class b/....eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/Profiler$Context.class
diff --git a/plugins/org.eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/Profiler.class b/plugins/org.eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/Profiler.class
diff --git a/...g.eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/ProfilerFactory.class b/...g.eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/ProfilerFactory.class
diff --git a/....acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/ProfilerPackage$Literals.class b/....acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/ProfilerPackage$Literals.class
diff --git a/...g.eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/ProfilerPackage.class b/...g.eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/ProfilerPackage.class
diff --git a/...eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/InternalImpl.class b/...eclipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/InternalImpl.class
diff --git a/...acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/LoopProfileEntryImpl.class b/...acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/LoopProfileEntryImpl.class
diff --git a/...pse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/ProfileEntryImpl.class b/...pse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/ProfileEntryImpl.class
diff --git a/....acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/ProfileResourceImpl.class b/....acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/ProfileResourceImpl.class
diff --git a/....acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/ProfilerFactoryImpl.class b/....acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/ProfilerFactoryImpl.class
diff --git a/....acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/ProfilerPackageImpl.class b/....acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/ProfilerPackageImpl.class
diff --git a/...eo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/spec/LoopProfileEntrySpec.class b/...eo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/spec/LoopProfileEntrySpec.class
diff --git a/...cceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/spec/ProfileEntrySpec.class b/...cceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/impl/spec/ProfileEntrySpec.class
diff --git a/...leo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/util/ProfilerAdapterFactory$1.class b/...leo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/util/ProfilerAdapterFactory$1.class
diff --git a/...celeo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/util/ProfilerAdapterFactory.class b/...celeo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/util/ProfilerAdapterFactory.class
diff --git a/...lipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/util/ProfilerSwitch.class b/...lipse.acceleo.aql.profiler/bin/org/eclipse/acceleo/aql/profiler/util/ProfilerSwitch.class