This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/grails-intellij-plugin.git
The following commit(s) were added to refs/heads/main by this push:
new 1fcc630 Remove debug logging from toolbar resolution fix
1fcc630 is described below
commit 1fcc630daf60cada9d6ba29b9f3c7c1f6234b572
Author: James Daugherty <[email protected]>
AuthorDate: Mon Jul 20 14:18:04 2026 -0500
Remove debug logging from toolbar resolution fix
---
.../plugins/grails/actions/GrailsActionUtil.kt | 22 +++++++++------------
.../grails/structure/GrailsApplicationManager.java | 1 -
.../structure/impl/Grails3ApplicationProvider.kt | 23 ++++------------------
3 files changed, 13 insertions(+), 33 deletions(-)
diff --git a/src/org/jetbrains/plugins/grails/actions/GrailsActionUtil.kt
b/src/org/jetbrains/plugins/grails/actions/GrailsActionUtil.kt
index 70dd0c1..f8e5e2f 100644
--- a/src/org/jetbrains/plugins/grails/actions/GrailsActionUtil.kt
+++ b/src/org/jetbrains/plugins/grails/actions/GrailsActionUtil.kt
@@ -48,16 +48,13 @@ class ArtefactData(
val isView: Boolean = false
)
-private val LOG = com.intellij.openapi.diagnostic.logger<ArtefactData>()
-
fun getArtefactData(context: DataContext?): ArtefactData? {
- if (context == null) { LOG.warn("GRAILS-DBG getArtefactData: context is
null"); return null }
- val project = context.getData(LangDataKeys.PROJECT) ?: run {
LOG.warn("GRAILS-DBG getArtefactData: PROJECT null"); return null }
- if (DumbService.isDumb(project)) { LOG.warn("GRAILS-DBG getArtefactData:
dumb mode"); return null }
- val module = context.getData(PlatformCoreDataKeys.MODULE) ?: run {
LOG.warn("GRAILS-DBG getArtefactData: MODULE null"); return null }
- val file = context.getData(LangDataKeys.VIRTUAL_FILE) ?: run {
LOG.warn("GRAILS-DBG getArtefactData: VIRTUAL_FILE null"); return null }
- val application =
GrailsApplicationManager.getInstance(project).findApplication(file) ?: run {
LOG.warn("GRAILS-DBG getArtefactData: findApplication null for ${file.name}");
return null }
- LOG.warn("GRAILS-DBG getArtefactData: passed gates for ${file.name},
module=${module.name}")
+ if (context == null) return null
+ val project = context.getData(LangDataKeys.PROJECT) ?: return null
+ if (DumbService.isDumb(project)) return null
+ val module = context.getData(PlatformCoreDataKeys.MODULE) ?: return null
+ val file = context.getData(LangDataKeys.VIRTUAL_FILE) ?: return null
+ val application =
GrailsApplicationManager.getInstance(project).findApplication(file) ?: return
null
val publicClass = GroovyUtils.getPublicClass(project, file)
val isView: Boolean
@@ -79,12 +76,11 @@ fun getArtefactData(context: DataContext?): ArtefactData? {
else {
publicClass
}
- artefactClass ?: run { LOG.warn("GRAILS-DBG getArtefactData: artefactClass
null"); return null }
+ artefactClass ?: return null
isView = false
- packageName = StringUtil.getPackageName(artefactClass.qualifiedName ?: run
{ LOG.warn("GRAILS-DBG getArtefactData: qualifiedName null"); return null })
- artefactName =
GrailsArtifact.getType(artefactClass)?.getArtifactName(artefactClass) ?: run {
LOG.warn("GRAILS-DBG getArtefactData: artifact type/name null for
${artefactClass.qualifiedName}"); return null }
+ packageName = StringUtil.getPackageName(artefactClass.qualifiedName ?:
return null)
+ artefactName =
GrailsArtifact.getType(artefactClass)?.getArtifactName(artefactClass) ?: return
null
}
- LOG.warn("GRAILS-DBG getArtefactData: SUCCESS name=$artefactName
isView=$isView")
return ArtefactData(project, module, file, packageName, artefactName,
application, isView)
}
diff --git
a/src/org/jetbrains/plugins/grails/structure/GrailsApplicationManager.java
b/src/org/jetbrains/plugins/grails/structure/GrailsApplicationManager.java
index 1c3d30b..c78c949 100644
--- a/src/org/jetbrains/plugins/grails/structure/GrailsApplicationManager.java
+++ b/src/org/jetbrains/plugins/grails/structure/GrailsApplicationManager.java
@@ -152,7 +152,6 @@ public final class GrailsApplicationManager implements
ModificationTracker, Disp
ProgressManager.checkCanceled();
final Collection<VirtualFile> appRoots = FilenameIndex
.getVirtualFilesByName("grails-app",
GlobalSearchScope.allScope(myProject));
- LOG.warn("GRAILS-DBG doGetApplications: found " + appRoots.size() + "
grails-app roots: " + ContainerUtil.map(appRoots, VirtualFile::getPath));
if (appRoots.isEmpty()) return Collections.emptyMap();
final Map<VirtualFile, GrailsApplication> result = new HashMap<>();
diff --git
a/src/org/jetbrains/plugins/grails/structure/impl/Grails3ApplicationProvider.kt
b/src/org/jetbrains/plugins/grails/structure/impl/Grails3ApplicationProvider.kt
index 9b65942..7a490d5 100644
---
a/src/org/jetbrains/plugins/grails/structure/impl/Grails3ApplicationProvider.kt
+++
b/src/org/jetbrains/plugins/grails/structure/impl/Grails3ApplicationProvider.kt
@@ -28,34 +28,19 @@ import org.jetbrains.plugins.grails.gradle.GrailsModuleData
import org.jetbrains.plugins.grails.structure.GrailsApplication
import org.jetbrains.plugins.grails.structure.GrailsApplicationProvider
-private val LOG =
com.intellij.openapi.diagnostic.logger<Grails3ApplicationProvider>()
-
class Grails3ApplicationProvider : GrailsApplicationProvider() {
override fun createApplication(project: Project, root: VirtualFile):
GrailsApplication? {
val path = root.path
val settings = ExternalSystemApiUtil.getSettings(project, SYSTEM_ID)
- val linkedProjectSettings = settings.getLinkedProjectSettings(path) as?
GradleProjectSettings ?: run {
- LOG.warn("GRAILS-DBG createApplication: no linkedProjectSettings for
path=$path; linked=${settings.linkedProjectsSettings.map {
it.externalProjectPath }}")
- return null
- }
+ val linkedProjectSettings = settings.getLinkedProjectSettings(path) as?
GradleProjectSettings ?: return null
val gradleProjectInfo =
ProjectDataManager.getInstance().getExternalProjectData(
project, SYSTEM_ID, linkedProjectSettings.externalProjectPath
- ) ?: run {
- LOG.warn("GRAILS-DBG createApplication: no externalProjectData for
${linkedProjectSettings.externalProjectPath}")
- return null
- }
+ ) ?: return null
- val moduleData = findModule(gradleProjectInfo.externalProjectStructure,
path) ?: run {
- LOG.warn("GRAILS-DBG createApplication: findModule null for path=$path")
- return null
- }
- if (ExternalSystemApiUtil.find(moduleData, GrailsModuleData.KEY) == null) {
- LOG.warn("GRAILS-DBG createApplication: no GrailsModuleData for
path=$path")
- return null
- }
- LOG.warn("GRAILS-DBG createApplication: SUCCESS for path=$path")
+ val moduleData = findModule(gradleProjectInfo.externalProjectStructure,
path) ?: return null
+ if (ExternalSystemApiUtil.find(moduleData, GrailsModuleData.KEY) == null)
return null
return if (linkedProjectSettings.isResolveModulePerSourceSet) {
Grails3MultiModuleApplication(project, root, moduleData)
