more warnings

Author: oowekyala

changelog.html

@@ -1,17 +1,13 @@
-<p>What's new:
-
-<ul>
-    <li>TODO</li>
-</ul>
-
 <p>What's changed:
+
 <ul>
-    <li>TODO</li>
+    <li>Bump required IntelliJ version to 2023.1</li>
 </ul>
 
 <p>What's fixed:
 <ul>
     <li>#25 - NoSuchElementException: Sequence contains no element matching the predicate</li>
     <li>#20 - Undefined token errors with user token manager. Undefined tokens are now ignored if the USER_TOKEN_MANAGER option is present.</li>
-    <li>#27 - INCLUDE is not lexed as an identifier</li>
+    <li>#27 - INCLUDE is not lexed as an identifier anymore.</li>
+    <li>Dependency updates</li>
 </ul>

gradle.properties

@@ -2,3 +2,4 @@ kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2G
 #https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#incremental-compilation
 kotlin.incremental.useClasspathSnapshot=false
+kotlin.stdlib.default.dependency = false

src/main/kotlin/com/github/oowekyala/ijcc/JavaccTemplateContextType.kt

@@ -2,8 +2,8 @@ package com.github.oowekyala.ijcc
 
 import com.github.oowekyala.ijcc.lang.psi.JccFile
 import com.intellij.codeInsight.template.EverywhereContextType
+import com.intellij.codeInsight.template.TemplateActionContext
 import com.intellij.codeInsight.template.TemplateContextType
-import com.intellij.psi.PsiFile
 
 /**
  * Context for live templates.
@@ -17,49 +17,49 @@ abstract class JccTemplateContextBase(
     baseContextType: Class<out TemplateContextType>
 ) : TemplateContextType("JAVACC_$id", displayName, baseContextType) {
 
-    override fun isInContext(file: PsiFile, offset: Int): Boolean {
-        return file is JccFile && isInContext(file, offset)
-
+    override fun isInContext(ctx: TemplateActionContext): Boolean {
+        return ctx.file is JccFile
+                && isInJccContext(ctx.file as JccFile, ctx)
     }
 
-    abstract fun isInContext(file: JccFile, offset: Int): Boolean
+    abstract fun isInJccContext(file: JccFile, ctx: TemplateActionContext): Boolean
 
     companion object {
 
         class Generic : JccTemplateContextBase("CODE", JavaccLanguage.displayName, EverywhereContextType::class.java) {
 
-            override fun isInContext(file: JccFile, offset: Int): Boolean = true
+            override fun isInJccContext(file: JccFile, ctx: TemplateActionContext): Boolean = true
         }
 
         class OptionsCtx : JccTemplateContextBase("OPTIONS", "Options declaration", Generic::class.java) {
 
 
-            override fun isInContext(file: JccFile, offset: Int): Boolean {
+            override fun isInJccContext(file: JccFile, ctx: TemplateActionContext): Boolean {
 
                 val pdeclOffset = file.parserDeclaration?.textOffset ?: Int.MAX_VALUE
 
-                return file.options == null && offset < pdeclOffset
+                return file.options == null && ctx.endOffset < pdeclOffset
             }
         }
 
         class ParserDeclCtx : JccTemplateContextBase("PARSER_DECL", "Parser declaration", Generic::class.java) {
 
 
-            override fun isInContext(file: JccFile, offset: Int): Boolean {
+            override fun isInJccContext(file: JccFile, ctx: TemplateActionContext): Boolean {
 
                 val optionsEnd = file.options?.let { it.textOffset + it.textLength } ?: 0
 
-                return file.parserDeclaration == null && offset > optionsEnd
+                return file.parserDeclaration == null && ctx.startOffset > optionsEnd
             }
         }
 
         class ProductionCtx :
             JccTemplateContextBase("PRODUCTION_DECLS", "Production declarations", Generic::class.java) {
 
-            override fun isInContext(file: JccFile, offset: Int): Boolean {
+            override fun isInJccContext(file: JccFile, ctx: TemplateActionContext): Boolean {
                 val parserEnd = file.parserDeclaration?.let { it.textOffset + it.textLength } ?: 0
 
-                return offset > parserEnd
+                return ctx.startOffset > parserEnd
             }
         }
     }

src/main/kotlin/com/github/oowekyala/ijcc/ide/quickdoc/JccDocumentationProvider.kt

@@ -14,7 +14,7 @@ import com.intellij.psi.PsiManager
  * @author Clément Fournier
  * @since 1.0
  */
-object JccDocumentationProvider : AbstractDocumentationProvider() {
+class JccDocumentationProvider : AbstractDocumentationProvider() {
 
     private val stopTypes = arrayOf(
         JccProduction::class.java,

src/main/kotlin/com/github/oowekyala/ijcc/lang/psi/JavaccAstFactory.kt

@@ -2,7 +2,7 @@ package com.github.oowekyala.ijcc.lang.psi
 
 import com.intellij.lang.ASTFactory
 import com.intellij.lang.DefaultASTFactory
-import com.intellij.openapi.components.ServiceManager
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.psi.impl.source.tree.CompositeElement
 import com.intellij.psi.impl.source.tree.FileElement
 import com.intellij.psi.impl.source.tree.LeafElement
@@ -16,19 +16,21 @@ import com.intellij.psi.tree.IFileElementType
  * @author Clément Fournier
  * @since 1.0
  */
-object JavaccAstFactory : ASTFactory() {
+class JavaccAstFactory : ASTFactory() {
 
-    private val myDefaultASTFactory = ServiceManager.getService(DefaultASTFactory::class.java)
-
-    override fun createComposite(type: IElementType): CompositeElement? {
+    override fun createComposite(type: IElementType): CompositeElement {
         return if (type is IFileElementType) {
             FileElement(type, null)
         } else CompositeElement(type)
     }
 
-    override fun createLeaf(type: IElementType, text: CharSequence): LeafElement? {
+    override fun createLeaf(type: IElementType, text: CharSequence): LeafElement {
         return when {
-            JccTypesExt.CommentTypeSet.contains(type) -> myDefaultASTFactory.createComment(type, text)
+            JccTypesExt.CommentTypeSet.contains(type) -> {
+                val default = ApplicationManager.getApplication().getService(DefaultASTFactory::class.java)
+                default.createComment(type, text)
+            }
+
             else                                      -> LeafPsiElement(type, text)
         }
     }

src/main/kotlin/com/github/oowekyala/ijcc/lang/psi/impl/JccElementFactory.kt

@@ -31,7 +31,7 @@ open class JccElementFactory(val project: Project) {
 
 
     fun insertEolCommentBefore(anchor: PsiElement, name: String) {
-        val parserFacade = PsiParserFacade.SERVICE.getInstance(project)
+        val parserFacade = PsiParserFacade.getInstance(project)
 
         val comment = parserFacade.createLineCommentFromText(JavaccFileType(), name)
         anchor.parent.addBefore(comment, anchor)
@@ -141,7 +141,7 @@ open class JccElementFactory(val project: Project) {
             .let { it as JccBnfProduction }
             .expansion
             .let { it as JccAssignedExpansionUnit }
-            .let { it.javaAssignmentLhs }
+            .javaAssignmentLhs
     }
 
 

src/main/kotlin/com/github/oowekyala/ijcc/lang/psi/stubs/StubIndexService.kt

@@ -1,6 +1,6 @@
 package com.github.oowekyala.ijcc.lang.psi.stubs
 
-import com.intellij.openapi.components.ServiceManager
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.psi.stubs.IndexSink
 
 /**
@@ -15,7 +15,8 @@ open class StubIndexService protected constructor() {
 
     companion object {
         @JvmStatic
-        fun getInstance(): StubIndexService = ServiceManager.getService(StubIndexService::class.java) ?: NO_INDEX
+        fun getInstance(): StubIndexService =
+            ApplicationManager.getApplication().getService(StubIndexService::class.java) ?: NO_INDEX
 
         private val NO_INDEX = StubIndexService()
     }

src/main/kotlin/com/github/oowekyala/ijcc/settings/JavaccAppSettingsService.kt

@@ -1,5 +1,6 @@
 package com.github.oowekyala.ijcc.settings
 
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.components.State
@@ -12,7 +13,7 @@ import com.intellij.openapi.components.Storage
  * @since 1.0
  */
 @State(name = "JavaccAppSettings", storages = [Storage("javacc-plugin.xml")])
-object JavaccAppSettingsService : PersistentStateComponent<JccGlobalSettingsState> {
+class JavaccAppSettingsService : PersistentStateComponent<JccGlobalSettingsState> {
 
     override fun loadState(state: JccGlobalSettingsState) {
         myState = state.copy()
@@ -28,7 +29,8 @@ object JavaccAppSettingsService : PersistentStateComponent<JccGlobalSettingsStat
  * App-level settings of the plugin.
  */
 val globalPluginSettings: JccGlobalSettingsState
-    get() = ServiceManager.getService(JavaccAppSettingsService::class.java).state
+    get() = ApplicationManager.getApplication()
+        .getService(JavaccAppSettingsService::class.java).state
 
 
 data class JccGlobalSettingsState(

src/main/kotlin/com/github/oowekyala/ijcc/settings/JavaccProjectSettingsService.kt

@@ -48,7 +48,7 @@ interface JavaccProjectSettingsService {
 
 /** Gets the instance of [JavaccProjectSettingsService] for this project. */
 val Project.javaccSettings: JavaccProjectSettingsService
-    get() = getService(this, JavaccProjectSettingsService::class.java)
+    get() = getService(JavaccProjectSettingsService::class.java)
         ?: error("Failed to get JavaccProjectSettingsService for $this")
 
 /** Gets the project-specific settings of the plugin. */

src/main/kotlin/com/github/oowekyala/ijcc/settings/PluginSettingsPage.kt

@@ -66,7 +66,7 @@ class PluginSettingsPage(initialState: JccSettingsState) : Disposable {
 
         @Language("HTML")
         private val injectionLabelText = """
-        <html lang='en'>
+        <html>
             Tune the level of sophistication of the Java injection in Java code fragments embedded in a grammar.
             By default, this is set to <b>${JavaccProjectSettingsService.defaultInjectionSupportLevel.displayName}</b>,
             which offers great code insight for a reasonable performance trade-off. The level <b>${InjectionSupportLevel.FULL.displayName}</b>