refactor: support all languages with base lang javascript (#866)

BFergerson · BFergerson · commit fbee2f179bb0 · 2022-10-09T19:21:06.000+04:00
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptMarker.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptMarker.kt
@@ -16,6 +16,7 @@
  */
 package spp.jetbrains.marker.js
 
+import spp.jetbrains.marker.SourceMarkerUtils
 import spp.jetbrains.marker.impl.*
 import spp.jetbrains.marker.js.service.*
 
@@ -37,11 +38,11 @@ object JavascriptMarker {
     }
 
     fun setup() {
-        ArtifactCreationService.addService(JavascriptArtifactCreationService(), "JavaScript", "ECMAScript 6")
-        ArtifactNamingService.addService(JavascriptArtifactNamingService(), "JavaScript", "ECMAScript 6")
-        ArtifactScopeService.addService(JavascriptArtifactScopeService(), "JavaScript", "ECMAScript 6")
-        ArtifactConditionService.addService(JavascriptArtifactConditionService(), "JavaScript", "ECMAScript 6")
-        ArtifactTypeService.addService(JavascriptArtifactTypeService(), "JavaScript", "ECMAScript 6")
-        SourceGuideProvider.addProvider(JavascriptGuideProvider(), "JavaScript", "ECMAScript 6")
+        ArtifactCreationService.addService(JavascriptArtifactCreationService(), SourceMarkerUtils.getJavaScriptLanguages())
+        ArtifactNamingService.addService(JavascriptArtifactNamingService(),  SourceMarkerUtils.getJavaScriptLanguages())
+        ArtifactScopeService.addService(JavascriptArtifactScopeService(),  SourceMarkerUtils.getJavaScriptLanguages())
+        ArtifactConditionService.addService(JavascriptArtifactConditionService(),  SourceMarkerUtils.getJavaScriptLanguages())
+        ArtifactTypeService.addService(JavascriptArtifactTypeService(),  SourceMarkerUtils.getJavaScriptLanguages())
+        SourceGuideProvider.addProvider(JavascriptGuideProvider(),  SourceMarkerUtils.getJavaScriptLanguages())
     }
 }
diff --git a/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactNamingService.kt b/marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/service/JavascriptArtifactNamingService.kt
@@ -16,6 +16,7 @@
  */
 package spp.jetbrains.marker.js.service
 
+import com.intellij.lang.Language
 import com.intellij.lang.javascript.psi.*
 import com.intellij.lang.javascript.psi.ecmal4.JSClass
 import com.intellij.openapi.project.Project
@@ -60,7 +61,7 @@ class JavascriptArtifactNamingService : IArtifactNamingService {
         return LiveSourceLocation(locationSource, lineNumber, service = serviceName)
     }
 
-    override fun getLocation(language: String, artifactQualifiedName: ArtifactQualifiedName): String {
+    override fun getLocation(language: Language, artifactQualifiedName: ArtifactQualifiedName): String {
         return if (artifactQualifiedName.identifier.contains("(")) {
             artifactQualifiedName.identifier
         } else {
diff --git a/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactNamingService.kt b/marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactNamingService.kt
@@ -16,6 +16,7 @@
  */
 package spp.jetbrains.marker.jvm.service
 
+import com.intellij.lang.Language
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.project.Project
 import com.intellij.psi.*
@@ -57,7 +58,7 @@ class JVMArtifactNamingService : IArtifactNamingService {
         return LiveSourceLocation(locationSource, lineNumber, service = serviceName)
     }
 
-    override fun getLocation(language: String, artifactQualifiedName: ArtifactQualifiedName): String {
+    override fun getLocation(language: Language, artifactQualifiedName: ArtifactQualifiedName): String {
         var fullyQualified = artifactQualifiedName.identifier
         if (fullyQualified.contains("#")) {
             fullyQualified = fullyQualified.substring(0, fullyQualified.indexOf("#"))
diff --git a/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactNamingService.kt b/marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/service/PythonArtifactNamingService.kt
@@ -16,6 +16,7 @@
  */
 package spp.jetbrains.marker.py.service
 
+import com.intellij.lang.Language
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
@@ -47,7 +48,7 @@ class PythonArtifactNamingService : IArtifactNamingService {
         return LiveSourceLocation(locationSource, lineNumber, service = serviceName)
     }
 
-    override fun getLocation(language: String, artifactQualifiedName: ArtifactQualifiedName): String {
+    override fun getLocation(language: Language, artifactQualifiedName: ArtifactQualifiedName): String {
         return artifactQualifiedName.identifier
     }
 
diff --git a/marker/src/main/kotlin/spp/jetbrains/marker/AbstractSourceMarkerService.kt b/marker/src/main/kotlin/spp/jetbrains/marker/AbstractSourceMarkerService.kt
@@ -16,6 +16,7 @@
  */
 package spp.jetbrains.marker
 
+import com.intellij.lang.Language
 import spp.protocol.artifact.ArtifactLanguage
 
 abstract class AbstractSourceMarkerService<T : ISourceMarkerService> {
@@ -31,10 +32,14 @@ abstract class AbstractSourceMarkerService<T : ISourceMarkerService> {
         languages.forEach { services[it] = service }
     }
 
-    internal fun getService(language: String): T {
+    private fun getService(language: String): T {
         return services[language] ?: throw IllegalArgumentException("No service for language $language")
     }
 
+    internal fun getService(language: Language): T {
+        return getService(language.baseLanguage?.id ?: language.id)
+    }
+
     fun getService(language: ArtifactLanguage): T {
         return when (language) {
             ArtifactLanguage.JVM -> getService("JAVA")
diff --git a/marker/src/main/kotlin/spp/jetbrains/marker/IArtifactNamingService.kt b/marker/src/main/kotlin/spp/jetbrains/marker/IArtifactNamingService.kt
@@ -16,6 +16,7 @@
  */
 package spp.jetbrains.marker
 
+import com.intellij.lang.Language
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
@@ -39,7 +40,7 @@ interface IArtifactNamingService : ISourceMarkerService {
         serviceName: String?
     ): LiveSourceLocation?
 
-    fun getLocation(language: String, artifactQualifiedName: ArtifactQualifiedName): String
+    fun getLocation(language: Language, artifactQualifiedName: ArtifactQualifiedName): String
     fun getVariableName(element: PsiElement): String?
     fun getFullyQualifiedName(element: PsiElement): ArtifactQualifiedName
     fun getQualifiedClassNames(psiFile: PsiFile): List<ArtifactQualifiedName>
diff --git a/marker/src/main/kotlin/spp/jetbrains/marker/SourceMarkerUtils.kt b/marker/src/main/kotlin/spp/jetbrains/marker/SourceMarkerUtils.kt
@@ -87,4 +87,8 @@ object SourceMarkerUtils {
     fun getJvmLanguages(): List<String> {
         return listOf("JAVA", "kotlin", "Groovy", "Scala")
     }
+
+    fun getJavaScriptLanguages(): List<String> {
+        return listOf("JavaScript", "ECMAScript 6")
+    }
 }
diff --git a/marker/src/main/kotlin/spp/jetbrains/marker/impl/ArtifactConditionService.kt b/marker/src/main/kotlin/spp/jetbrains/marker/impl/ArtifactConditionService.kt
@@ -48,6 +48,6 @@ object ArtifactConditionService : AbstractSourceMarkerService<IArtifactCondition
     }
 
     override fun getCondition(condition: String, context: PsiElement): String {
-        return getService(context.language.id).getCondition(condition, context)
+        return getService(context.language).getCondition(condition, context)
     }
 }
diff --git a/marker/src/main/kotlin/spp/jetbrains/marker/impl/ArtifactCreationService.kt b/marker/src/main/kotlin/spp/jetbrains/marker/impl/ArtifactCreationService.kt
@@ -41,7 +41,7 @@ object ArtifactCreationService : AbstractSourceMarkerService<IArtifactCreationSe
         lineNumber: Int,
         autoApply: Boolean
     ): Optional<ExpressionGutterMark> {
-        return getService(fileMarker.psiFile.language.id)
+        return getService(fileMarker.psiFile.language)
             .getOrCreateExpressionGutterMark(fileMarker, lineNumber, autoApply)
     }
 
@@ -50,7 +50,7 @@ object ArtifactCreationService : AbstractSourceMarkerService<IArtifactCreationSe
         element: PsiElement,
         autoApply: Boolean
     ): MethodGutterMark? {
-        return getService(fileMarker.psiFile.language.id)
+        return getService(fileMarker.psiFile.language)
             .getOrCreateMethodGutterMark(fileMarker, element, autoApply)
     }
 
@@ -59,7 +59,7 @@ object ArtifactCreationService : AbstractSourceMarkerService<IArtifactCreationSe
         lineNumber: Int,
         autoApply: Boolean
     ): Optional<ExpressionInlayMark> {
-        return getService(fileMarker.psiFile.language.id)
+        return getService(fileMarker.psiFile.language)
             .getOrCreateExpressionInlayMark(fileMarker, lineNumber, autoApply)
     }
 
@@ -75,7 +75,7 @@ object ArtifactCreationService : AbstractSourceMarkerService<IArtifactCreationSe
         element: PsiElement,
         autoApply: Boolean
     ): MethodGutterMark {
-        return getService(fileMarker.psiFile.language.id)
+        return getService(fileMarker.psiFile.language)
             .createMethodGutterMark(fileMarker, element, autoApply)
     }
 
@@ -84,7 +84,7 @@ object ArtifactCreationService : AbstractSourceMarkerService<IArtifactCreationSe
         element: PsiElement,
         autoApply: Boolean
     ): MethodInlayMark {
-        return getService(fileMarker.psiFile.language.id)
+        return getService(fileMarker.psiFile.language)
             .createMethodInlayMark(fileMarker, element, autoApply)
     }
 
@@ -100,7 +100,7 @@ object ArtifactCreationService : AbstractSourceMarkerService<IArtifactCreationSe
         lineNumber: Int,
         autoApply: Boolean
     ): ExpressionGutterMark {
-        return getService(fileMarker.psiFile.language.id)
+        return getService(fileMarker.psiFile.language)
             .createExpressionGutterMark(fileMarker, lineNumber, autoApply)
     }
 
@@ -109,7 +109,7 @@ object ArtifactCreationService : AbstractSourceMarkerService<IArtifactCreationSe
         lineNumber: Int,
         autoApply: Boolean
     ): ExpressionInlayMark {
-        return getService(fileMarker.psiFile.language.id)
+        return getService(fileMarker.psiFile.language)
             .createExpressionInlayMark(fileMarker, lineNumber, autoApply)
     }
 }
diff --git a/marker/src/main/kotlin/spp/jetbrains/marker/impl/ArtifactNamingService.kt b/marker/src/main/kotlin/spp/jetbrains/marker/impl/ArtifactNamingService.kt
@@ -16,6 +16,7 @@
  */
 package spp.jetbrains.marker.impl
 
+import com.intellij.lang.Language
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
@@ -40,23 +41,23 @@ object ArtifactNamingService : AbstractSourceMarkerService<IArtifactNamingServic
         lineNumber: Int,
         serviceName: String?
     ): LiveSourceLocation? {
-        return getService(sourceMark.language.id).getLiveSourceLocation(sourceMark, lineNumber, serviceName)
+        return getService(sourceMark.language).getLiveSourceLocation(sourceMark, lineNumber, serviceName)
     }
 
-    override fun getLocation(language: String, artifactQualifiedName: ArtifactQualifiedName): String {
+    override fun getLocation(language: Language, artifactQualifiedName: ArtifactQualifiedName): String {
         return getService(language).getLocation(language, artifactQualifiedName)
     }
 
     override fun getVariableName(element: PsiElement): String? {
-        return getService(element.language.id).getVariableName(element)
+        return getService(element.language).getVariableName(element)
     }
 
     override fun getFullyQualifiedName(element: PsiElement): ArtifactQualifiedName {
-        return getService(element.language.id).getFullyQualifiedName(element)
+        return getService(element.language).getFullyQualifiedName(element)
     }
 
     override fun getQualifiedClassNames(psiFile: PsiFile): List<ArtifactQualifiedName> {
-        return getService(psiFile.language.id).getQualifiedClassNames(psiFile)
+        return getService(psiFile.language).getQualifiedClassNames(psiFile)
     }
 
     override fun findPsiFile(language: ArtifactLanguage, project: Project, frame: LiveStackTraceElement): PsiFile? {
diff --git a/marker/src/main/kotlin/spp/jetbrains/marker/impl/ArtifactScopeService.kt b/marker/src/main/kotlin/spp/jetbrains/marker/impl/ArtifactScopeService.kt
@@ -30,18 +30,18 @@ import spp.jetbrains.marker.source.SourceFileMarker
 object ArtifactScopeService : AbstractSourceMarkerService<IArtifactScopeService>(), IArtifactScopeService {
 
     override fun getScopeVariables(fileMarker: SourceFileMarker, lineNumber: Int): List<String> {
-        return getService(fileMarker.psiFile.language.id).getScopeVariables(fileMarker, lineNumber)
+        return getService(fileMarker.psiFile.language).getScopeVariables(fileMarker, lineNumber)
     }
 
     override fun isInsideFunction(element: PsiElement): Boolean {
-        return getService(element.language.id).isInsideFunction(element)
+        return getService(element.language).isInsideFunction(element)
     }
 
     override fun isInsideEndlessLoop(element: PsiElement): Boolean {
-        return getService(element.language.id).isInsideEndlessLoop(element)
+        return getService(element.language).isInsideEndlessLoop(element)
     }
 
     override fun isJVM(element: PsiElement): Boolean {
-        return getService(element.language.id).isJVM(element)
+        return getService(element.language).isJVM(element)
     }
 }
diff --git a/marker/src/main/kotlin/spp/jetbrains/marker/impl/ArtifactTypeService.kt b/marker/src/main/kotlin/spp/jetbrains/marker/impl/ArtifactTypeService.kt
@@ -24,6 +24,6 @@ import spp.protocol.artifact.ArtifactType
 object ArtifactTypeService : AbstractSourceMarkerService<IArtifactTypeService>(), IArtifactTypeService {
 
     override fun getType(element: PsiElement): ArtifactType? {
-        return getService(element.language.id).getType(element)
+        return getService(element.language).getType(element)
     }
 }
diff --git a/marker/src/main/kotlin/spp/jetbrains/marker/impl/SourceGuideProvider.kt b/marker/src/main/kotlin/spp/jetbrains/marker/impl/SourceGuideProvider.kt
@@ -16,7 +16,9 @@
  */
 package spp.jetbrains.marker.impl
 
+import com.intellij.lang.Language
 import com.intellij.openapi.application.ReadAction
+import com.intellij.openapi.diagnostic.logger
 import spp.jetbrains.marker.AbstractSourceGuideProvider
 import spp.jetbrains.marker.source.SourceFileMarker
 
@@ -28,6 +30,7 @@ import spp.jetbrains.marker.source.SourceFileMarker
  */
 object SourceGuideProvider : AbstractSourceGuideProvider {
 
+    private val log = logger<SourceGuideProvider>()
     private val providers = mutableMapOf<String, MutableList<AbstractSourceGuideProvider>>()
 
     fun addProvider(guideProvider: AbstractSourceGuideProvider, language: String, vararg languages: String) {
@@ -39,19 +42,28 @@ object SourceGuideProvider : AbstractSourceGuideProvider {
         languages.forEach { providers.computeIfAbsent(it) { mutableListOf() }.add(guideProvider) }
     }
 
-    private fun getProvider(language: String): AbstractSourceGuideProvider {
+    private fun getProvider(language: String): AbstractSourceGuideProvider? {
         return providers[language]?.let {
             object : AbstractSourceGuideProvider {
                 override fun determineGuideMarks(fileMarker: SourceFileMarker) {
                     it.forEach { provider -> provider.determineGuideMarks(fileMarker) }
                 }
             }
-        } ?: throw IllegalArgumentException("No provider for language $language")
+        }
+    }
+
+    private fun getProvider(language: Language): AbstractSourceGuideProvider? {
+        return getProvider(language.baseLanguage?.id ?: language.id)
     }
 
     override fun determineGuideMarks(fileMarker: SourceFileMarker) {
         ReadAction.run<Nothing> {
-            getProvider(fileMarker.psiFile.language.id).determineGuideMarks(fileMarker)
+            val guideProvider = getProvider(fileMarker.psiFile.language)
+            if (guideProvider != null) {
+                guideProvider.determineGuideMarks(fileMarker)
+            } else {
+                log.warn("No guide provider found for language: ${fileMarker.psiFile.language}")
+            }
         }
     }
 }
diff --git a/plugin/src/main/java/spp/jetbrains/sourcemarker/ControlBar.java b/plugin/src/main/java/spp/jetbrains/sourcemarker/ControlBar.java
@@ -219,7 +219,7 @@ private void initComponents() {
         setBackground(getBackgroundColor());
         label1 = new JLabel();
         String location = ArtifactNamingService.INSTANCE.getLocation(
-                inlayMark.getLanguage().getID(),
+                inlayMark.getLanguage(),
                 inlayMark.getArtifactQualifiedName()
         );
         textField1 = new AutocompleteField(

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`*/`
`17`	`17`	`package spp.jetbrains.marker.py.service`
`18`	`18`
	`19`	`+import com.intellij.lang.Language`
`19`	`20`	`import com.intellij.openapi.project.Project`
`20`	`21`	`import com.intellij.psi.PsiElement`
`21`	`22`	`import com.intellij.psi.PsiFile`
`@@ -47,7 +48,7 @@ class PythonArtifactNamingService : IArtifactNamingService {`
`47`	`48`	`return LiveSourceLocation(locationSource, lineNumber, service = serviceName)`
`48`	`49`	`}`
`49`	`50`
`50`		`- override fun getLocation(language: String, artifactQualifiedName: ArtifactQualifiedName): String {`
	`51`	`+ override fun getLocation(language: Language, artifactQualifiedName: ArtifactQualifiedName): String {`
`51`	`52`	`return artifactQualifiedName.identifier`
`52`	`53`	`}`
`53`	`54`
Original file line number	Diff line number	Diff line change
`@@ -87,4 +87,8 @@ object SourceMarkerUtils {`
`87`	`87`	`fun getJvmLanguages(): List<String> {`
`88`	`88`	`return listOf("JAVA", "kotlin", "Groovy", "Scala")`
`89`	`89`	`}`
	`90`	`+`
	`91`	`+ fun getJavaScriptLanguages(): List<String> {`
	`92`	`+ return listOf("JavaScript", "ECMAScript 6")`
	`93`	`+ }`
`90`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,6 @@ object ArtifactConditionService : AbstractSourceMarkerService<IArtifactCondition`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`override fun getCondition(condition: String, context: PsiElement): String {`
`51`		`- return getService(context.language.id).getCondition(condition, context)`
	`51`	`+ return getService(context.language).getCondition(condition, context)`
`52`	`52`	`}`
`53`	`53`	`}`