Support the extern keyword (#59)

.github/workflows/build.yml

@@ -111,7 +111,7 @@ jobs:
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2022.2.1
+        uses: JetBrains/qodana-action@v2023.1.0
 
       # Prepare plugin archive content for creating artifact
       - name: Prepare Plugin Artifact

CHANGELOG.md

@@ -3,6 +3,8 @@
 # FacilityIntellij Changelog
 
 ## [Unreleased]
+- Added support for the 2023.1 Intellij platform
+- Added support for the `extern` keyword
 
 ## [1.1.2]
 - Added support for the 2023.1 Intellij platform

build.gradle.kts

@@ -8,17 +8,17 @@ plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.7.10"
+    id("org.jetbrains.kotlin.jvm") version "1.8.21"
     // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.9.0"
+    id("org.jetbrains.intellij") version "1.13.3"
     // Gradle Changelog Plugin
-    id("org.jetbrains.changelog") version "1.3.1"
+    id("org.jetbrains.changelog") version "2.0.0"
     // Gradle Qodana Plugin
     id("org.jetbrains.qodana") version "0.1.13"
     // Gradle GrammarKit Plugin
     id("org.jetbrains.grammarkit") version "2021.2.2"
     // ktlint Plugin
-    id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
+    id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
 }
 
 group = properties("pluginGroup")
@@ -100,7 +100,7 @@ tasks {
                     throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
                 }
                 subList(indexOf(start) + 1, indexOf(end))
-            }.joinToString("\n").run { markdownToHTML(this) }
+            }.joinToString("\n").run { markdownToHTML(this) },
         )
 
         // Get the latest available change notes from the changelog file
@@ -109,7 +109,7 @@ tasks {
                 changelog.run {
                     getOrNull(properties("pluginVersion")) ?: getLatest()
                 }.toHTML()
-            }
+            },
         )
     }
 
@@ -143,5 +143,5 @@ tasks {
 }
 
 ktlint {
-    version.set("0.45.2")
+    version.set("0.48.1")
 }

gradle.properties

@@ -3,7 +3,7 @@
 
 pluginGroup = io.github.facilityapi
 pluginName = FacilityIntellij
-pluginVersion = 1.1.2
+pluginVersion = 1.2.0
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
@@ -26,7 +26,7 @@ platformPlugins =
 # Java 17 will be required when targeting 2022.2
 javaVersion = 11
 
-gradleVersion = 7.5.1
+gradleVersion = 8.1.1
 
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.

src/main/kotlin/io/github/facilityapi/intellij/editor/FsdColorSettingsPage.kt

@@ -25,31 +25,31 @@ class FsdColorSettingsPage : ColorSettingsPage {
         private val DESCRIPTORS = arrayOf(
             AttributesDescriptor(
                 FsdBundle.getMessage("settings.color.displayname.markup"),
-                FsdSyntaxHighlighter.MARKUP_HEADING_KEYS[0]
+                FsdSyntaxHighlighter.MARKUP_HEADING_KEYS[0],
             ),
             AttributesDescriptor(
                 FsdBundle.getMessage("settings.color.displayname.comment"),
-                FsdSyntaxHighlighter.COMMENT_KEYS[0]
+                FsdSyntaxHighlighter.COMMENT_KEYS[0],
             ),
             AttributesDescriptor(
                 FsdBundle.getMessage("settings.color.displayname.keyword"),
-                FsdSyntaxHighlighter.KEYWORD_KEYS[0]
+                FsdSyntaxHighlighter.KEYWORD_KEYS[0],
             ),
             AttributesDescriptor(
                 FsdBundle.getMessage("settings.color.displayname.primitive"),
-                FsdSyntaxHighlighter.PRIMITIVE_TYPE_KEYS[0]
+                FsdSyntaxHighlighter.PRIMITIVE_TYPE_KEYS[0],
             ),
             AttributesDescriptor(
                 FsdBundle.getMessage("settings.color.displayname.typeref"),
-                FsdSyntaxHighlighter.TYPE_REFERENCE_KEYS[0]
+                FsdSyntaxHighlighter.TYPE_REFERENCE_KEYS[0],
             ),
             AttributesDescriptor(
                 FsdBundle.getMessage("settings.color.displayname.attribute"),
-                FsdSyntaxHighlighter.ATTRIBUTE_NAME_KEYS[0]
+                FsdSyntaxHighlighter.ATTRIBUTE_NAME_KEYS[0],
             ),
             AttributesDescriptor(
                 FsdBundle.getMessage("settings.color.displayname.attributeparametervalue"),
-                FsdSyntaxHighlighter.ATTRIBUTE_ARGUMENT_KEYS[0]
+                FsdSyntaxHighlighter.ATTRIBUTE_ARGUMENT_KEYS[0],
             ),
         )
     }

src/main/kotlin/io/github/facilityapi/intellij/editor/FsdCompletionContributor.kt

@@ -20,7 +20,7 @@ class FsdCompletionContributor : CompletionContributor() {
                 override fun addCompletions(
                     parameters: CompletionParameters,
                     context: ProcessingContext,
-                    resultSet: CompletionResultSet
+                    resultSet: CompletionResultSet,
                 ) {
                     resultSet.addElement(LookupElementBuilder.create("string"))
                     resultSet.addElement(LookupElementBuilder.create("boolean"))
@@ -35,7 +35,7 @@ class FsdCompletionContributor : CompletionContributor() {
                     resultSet.addElement(LookupElementBuilder.create("nullable"))
                     resultSet.addElement(LookupElementBuilder.create("error"))
                 }
-            }
+            },
         )
     }
 }

src/main/kotlin/io/github/facilityapi/intellij/editor/FsdSyntaxHighlighter.kt

@@ -36,15 +36,18 @@ class FsdSyntaxHighlighter : SyntaxHighlighterBase() {
             FsdTypes.MAP,
             FsdTypes.RESULT,
             FsdTypes.NULLABLE,
-            FsdTypes.ERROR -> PRIMITIVE_TYPE_KEYS
+            FsdTypes.ERROR,
+            -> PRIMITIVE_TYPE_KEYS
 
             FsdTypes.TYPENAME -> TYPE_REFERENCE_KEYS
 
             FsdTypes.SERVICE,
             FsdTypes.DATA,
             FsdTypes.METHOD,
             FsdTypes.ENUM,
-            FsdTypes.ERRORS -> KEYWORD_KEYS
+            FsdTypes.ERRORS,
+            FsdTypes.EXTERN,
+            -> KEYWORD_KEYS
 
             else -> emptyArray()
         }

src/main/kotlin/io/github/facilityapi/intellij/formatting/FsdBlock.kt

@@ -21,7 +21,7 @@ class FsdBlock(
     node: ASTNode,
     wrap: Wrap?,
     alignment: Alignment?,
-    private val codeStyleSettings: CodeStyleSettings
+    private val codeStyleSettings: CodeStyleSettings,
 ) : AbstractBlock(node, wrap, alignment), BlockWithParent {
 
     private var parent: BlockWithParent? = null
@@ -72,7 +72,9 @@ class FsdBlock(
             return if (reversedBlocks.any { (it as ASTBlock).node?.elementType == FsdTypes.LEFT_BRACE }) {
                 val f = if (previousBlock?.node?.elementType == FsdTypes.RIGHT_BRACKET) {
                     reversedBlocks.firstOrNull { (it as ASTBlock).node?.elementType == FsdTypes.LEFT_BRACKET }
-                } else null
+                } else {
+                    null
+                }
                 ChildAttributes(Indent.getNormalIndent(), f?.alignment)
             } else {
                 ChildAttributes(Indent.getNoneIndent(), alignment)

src/main/kotlin/io/github/facilityapi/intellij/fsd.bnf

@@ -45,8 +45,8 @@ definition ::= (attribute_list* service_spec) markdown_remarks*
 service_spec ::= service identifier service_items { pin=1 }
 service_items ::= ('{' decorated_service_item* '}') | decorated_service_item
 decorated_service_item ::= attribute_list* service_item
-private service_item ::=  (enum_spec | data_spec | method_spec | error_set_spec) { recoverWhile=service_item_recover }
-private service_item_recover ::= !('[' | '}' | enum | data | errors | method)
+private service_item ::=  (extern_decl | enum_spec | data_spec | method_spec | error_set_spec) { recoverWhile=service_item_recover }
+private service_item_recover ::= !('[' | '}' | extern | enum | data | errors | method)
 
 private field_list ::= '{' (comment+ | decorated_field)* '}' { pin=1 }
 
@@ -79,6 +79,8 @@ attribute_parameters ::= '(' attribute_parameter (',' attribute_parameter)* ')'
 attribute_parameter ::= identifier ':' attribute_parameter_value
 private attribute_parameter_value ::= attributeparametervalue { name="attribute parameter value" }
 
+extern_decl ::= extern (data | enum) identifier ';'
+
 decorated_field ::= attribute_list* field { pin=2 }
 field ::= identifier ':' type [ '!' ] ';' { pin=3 }
 type ::= (string | boolean | int32 | int64 | double | decimal | bytes | object | map | result | error | nullable | reference_type) [ type_parameter ] [ ('['']')* ]

src/main/kotlin/io/github/facilityapi/intellij/inspection/DuplicateAttributeInspection.kt

@@ -14,7 +14,7 @@ class DuplicateAttributeInspection : LocalInspectionTool() {
     override fun buildVisitor(
         holder: ProblemsHolder,
         isOnTheFly: Boolean,
-        session: LocalInspectionToolSession
+        session: LocalInspectionToolSession,
     ): PsiElementVisitor = object : PsiElementVisitor() {
         private val deleteAttributeFix = DeleteAttributeFix()
 

src/main/kotlin/io/github/facilityapi/intellij/inspection/DuplicateMemberInspection.kt

@@ -26,7 +26,7 @@ class DuplicateMemberInspection : LocalInspectionTool() {
     override fun buildVisitor(
         holder: ProblemsHolder,
         isOnTheFly: Boolean,
-        session: LocalInspectionToolSession
+        session: LocalInspectionToolSession,
     ): PsiElementVisitor = object : PsiElementVisitor() {
         private val fix = Fix()