Merge pull request #41 from londonbrown/master

Support 2022.2

.github/workflows/build.yml

@@ -1,5 +1,4 @@
-
-# Github Action Workflow for building a new commit to the primary repo branch and publishing a new release to beta.
+# GitHub Action Workflow for building a new commit to the primary repo branch and publishing a new release to beta.
 #
 # Workflow is triggered on pushes into master.
 #
@@ -37,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        product: [ "IC-2020.2", "IC-2021.1", "IC-2022.1" ]
+        product: [ "IC-2020.2", "IC-2021.1", "IC-2022.1", "IC-2022.2" ]
       max-parallel: 5
     env:
       PRODUCT_NAME: ${{ matrix.product }}

.github/workflows/pr.yml

@@ -1,4 +1,4 @@
-# Github Action Workflow for building a pull request commit and validating that the commit builds for all
+# GitHub Action Workflow for building a pull request commit and validating that the commit builds for all
 # release versions of the plugin.
 #
 # Workflow is triggered on pull requests to the repo.
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        product: [ "IC-2020.2", "IC-2021.1", "IC-2022.1" ]
+        product: [ "IC-2020.2", "IC-2021.1", "IC-2022.1", "IC-2022.2" ]
       max-parallel: 5
     env:
       PRODUCT_NAME: ${{ matrix.product }}

.github/workflows/release-eap.yml

@@ -1,4 +1,4 @@
-# Github Action Workflow for releasing a new stable version of the plugin.
+# GitHub Action Workflow for releasing a new stable version of the plugin.
 #
 # Workflow is triggered manually w/ proper access.
 #

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-# Github Action Workflow for releasing a new stable version of the plugin.
+# GitHub Action Workflow for releasing a new stable version of the plugin.
 #
 # Workflow is triggered manually w/ proper access.
 #
@@ -18,7 +18,7 @@ jobs:
   release:
     strategy:
       matrix:
-        product: [  "IC-2020.2", "IC-2021.1", "IC-2022.1" ]
+        product: [  "IC-2020.2", "IC-2021.1", "IC-2022.1", "IC-2022.2" ]
       max-parallel: 1
     env:
       PRODUCT_NAME: ${{ matrix.product }}

build.gradle.kts

@@ -12,7 +12,7 @@ buildscript {
 
 plugins {
     kotlin("jvm")
-    id("org.jetbrains.intellij") version "1.5.2"
+    id("org.jetbrains.intellij") version "1.10.0"
 }
 
 repositories {
@@ -52,10 +52,21 @@ val plugins = listOf(
             apiVersion = "1.5"
         ),
         dependencies = listOf("java", "Kotlin")
+    ),
+    PluginDescriptor(
+        since = "222",
+        until = "223.*",
+        sdkVersion = "IC-2022.2",
+        platformType = PlatformType.IdeaCommunity,
+        sourceFolder = "IC-222",
+        kotlin = KotlinOptions(
+            apiVersion = "1.6"
+        ),
+        dependencies = listOf("java", "Kotlin")
     )
 )
 
-val defaultProductName = "IC-2022.1"
+val defaultProductName = "IC-2022.2"
 val productName = System.getenv("PRODUCT_NAME") ?: defaultProductName
 val maybeGithubRunNumber = System.getenv("GITHUB_RUN_NUMBER")?.toInt()
 val descriptor = plugins.first { it.sdkVersion == productName }

buildSrc/build.gradle.kts

@@ -11,5 +11,5 @@ repositories {
 }
 
 dependencies {
-    api(kotlin("gradle-plugin", version = "1.5.10"))
+    api(kotlin("gradle-plugin", version = "1.7.10"))
 }

src/IC-222/kotlin/com/amazon/ion/plugin/intellij/formatting/IonFormattingModelBuilder.kt

@@ -0,0 +1,34 @@
+package com.amazon.ion.plugin.intellij.formatting
+
+import com.amazon.ion.plugin.intellij.formatting.blocks.IonBlockOptions
+import com.amazon.ion.plugin.intellij.formatting.blocks.RootIonBlock
+import com.intellij.formatting.FormattingContext
+import com.intellij.formatting.FormattingModel
+import com.intellij.formatting.FormattingModelBuilder
+import com.intellij.formatting.FormattingModelProvider
+
+/**
+ * Creates the block model for an Ion file.
+ *
+ * The block model will determine how elements are spaced, indented and aligned.
+ */
+class IonFormattingModelBuilder : FormattingModelBuilder {
+    override fun createModel(formattingContext: FormattingContext): FormattingModel {
+        val element = formattingContext.psiElement
+        val settings = formattingContext.codeStyleSettings
+
+        val rootBlock = RootIonBlock(
+            node = element.node,
+            options = IonBlockOptions(
+                spaceBuilder = IonCodeBlockSpacingProvider(settings),
+                codeStyle = settings
+            )
+        )
+
+
+        return FormattingModelProvider.createFormattingModelForPsiFile(
+            element.containingFile,
+            rootBlock, settings
+        )
+    }
+}

src/main/kotlin/com/amazon/ion/plugin/intellij/utils/IonSearchUtils.kt

@@ -33,7 +33,7 @@ object IonSearchUtils {
 
         return ionFiles.flatMap {
             val ionFile = psiManager.findFile(it) as? IonFile ?: return emptyList()
-            PsiTreeUtil.getChildrenOfType(ionFile, IonSexpressionOperator::class.java).toList()
+            PsiTreeUtil.getChildrenOfType(ionFile, IonSexpressionOperator::class.java)?.toList() ?: emptyList()
         }
     }