Skip to content

Commit c955638

Browse files
helin24helin24
authored
Try 2026.1.1 (not verified) (#360)
* Try 2026.1.1 (not verified) * Add java version resolver * Use newer version * Upgrade again * Use v1 * Update baselines * Fix tests by adding caret * Update kotlin * Remove old comment
1 parent 889dc55 commit c955638

9 files changed

Lines changed: 20 additions & 11 deletions

File tree

‎third_party/gradle.properties‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ pluginId = Dart
1616
pluginSinceBuild = 251
1717
pluginUntilBuild = 261.*
1818

19-
# Tracking issue for changes required to bumpt to 2025.2.6.1: https://github.com/flutter/dart-intellij-third-party/issues/352
20-
ideaVersion = 2025.1.7
19+
ideaVersion = 2026.1.1
2120

2221
javaVersion = 21
2322

‎third_party/gradle/libs.versions.toml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
[versions]
55
guava = "33.6.0-jre"
66
junit = "4.13.2"
7-
# Bumping to 2.3.21 is blocked on an `ideaVersion` update:
8-
# https://github.com/flutter/dart-intellij-third-party/issues/352
9-
kotlin = "2.2.21"
7+
kotlin = "2.3.21"
108
intellijPlatform = "2.15.0"
119
changelog = "2.5.0"
1210
kover = "0.9.8"

‎third_party/settings.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
plugins {
2+
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
3+
}
4+
15
rootProject.name = "Dart"

‎third_party/src/test/testData/folding/FileHeaderBeforePartOf.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<fold text='/.../' expand='false'>//
22
//</fold>
3-
part of foo;
3+
part of foo;<caret>

‎third_party/src/test/testData/folding/FileHeaderBeforeSingleImport.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
*/</fold>
44
import "dart:core";
55

6-
class A{}
6+
class A{}<caret>

‎third_party/tool/baseline/251/verifier-baseline.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* Experimental API class com.redhat.devtools.lsp4ij.client.features.LSPClientFeatures is referenced in com.jetbrains.lang.dart.lsp.DartLspClientFeatures.createLauncherBuilder() : Launcher.Builder. This class can be changed in a future release leading to incompatibilities
5858
* Experimental API constructor com.redhat.devtools.lsp4ij.client.features.LSPClientFeatures.<init>() is invoked in com.jetbrains.lang.dart.lsp.DartLspClientFeatures.<init>(). This constructor can be changed in a future release leading to incompatibilities
5959
* Experimental API method com.intellij.openapi.command.CoroutinesKt.writeCommandAction(com.intellij.openapi.project.Project project, java.lang.String commandName, kotlin.jvm.functions.Function0 action, kotlin.coroutines.Continuation $completion) : java.lang.Object is invoked in com.jetbrains.lang.dart.analyzer.DartAnalysisServerImpl.lsp_workspaceApplyEdit$1.invokeSuspend(Object) : Object. This method can be changed in a future release leading to incompatibilities
60-
* Experimental API method com.intellij.openapi.components.ServicesKt.serviceAsync(com.intellij.openapi.components.ComponentManager $this$serviceAsync, java.lang.Class keyClass, kotlin.coroutines.Continuation $completion) : java.lang.Object is invoked in com.jetbrains.lang.dart.ide.actions.DartPubActionBase.Companion.showPubOutputConsole(Module, GeneralCommandLine, OSProcessHandler, VirtualFile, String, Continuation) : Object. This method can be changed in a future release leading to incompatibilities
60+
* Experimental API method com.intellij.openapi.components.ComponentManagerEx.getServiceAsync(java.lang.Class keyClass, kotlin.coroutines.Continuation $completion) : java.lang.Object is invoked in com.jetbrains.lang.dart.ide.actions.DartPubActionBase.Companion.showPubOutputConsole(Module, GeneralCommandLine, OSProcessHandler, VirtualFile, String, Continuation) : Object. This method can be changed in a future release leading to incompatibilities
6161
* Experimental API method com.intellij.openapi.vfs.newvfs.events.VFilePropertyChangeEvent.isRename() : boolean is invoked in com.jetbrains.lang.dart.DartFileListener.prepareChange(List) : AsyncFileListener.ChangeApplier. This method can be changed in a future release leading to incompatibilities
6262
* Experimental API method com.redhat.devtools.lsp4ij.client.features.LSPClientFeatures.createLauncherBuilder() : org.eclipse.lsp4j.jsonrpc.Launcher.Builder is overridden in class com.jetbrains.lang.dart.lsp.DartLspClientFeatures. This method can be changed in a future release leading to incompatibilities
6363
* Experimental API method com.redhat.devtools.lsp4ij.client.features.LSPClientFeatures.getProject() : com.intellij.openapi.project.Project is invoked in com.jetbrains.lang.dart.lsp.DartLauncherBuilder.createMessageProducer(InputStream, MessageJsonHandler, MessageIssueHandler) : MessageProducer. This method can be changed in a future release leading to incompatibilities
@@ -79,6 +79,8 @@
7979
* Internal field com.intellij.psi.impl.include.FileIncludeInfo.EMPTY : com.intellij.psi.impl.include.FileIncludeInfo[] is accessed in com.jetbrains.lang.dart.psi.DartPackageAwareFileIncludeProvider.getIncludeInfos(FileContent) : FileIncludeInfo[]. This field is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the field is not supposed to be used in client code.
8080
* Internal field com.intellij.psi.impl.include.FileIncludeInfo.EMPTY : com.intellij.psi.impl.include.FileIncludeInfo[] is accessed in com.jetbrains.lang.dart.psi.DartPackageAwareFileIncludeProvider.getIncludeInfos(XmlFile) : FileIncludeInfo[]. This field is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the field is not supposed to be used in client code.
8181
* Internal field com.intellij.psi.impl.include.FileIncludeInfo.path : java.lang.String is accessed in com.jetbrains.lang.dart.psi.DartPackageAwareFileIncludeProvider.resolveIncludedFile(FileIncludeInfo, PsiFile) : PsiFileSystemItem. This field is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the field is not supposed to be used in client code.
82+
* Internal interface com.intellij.openapi.components.ComponentManagerEx is referenced in com.jetbrains.lang.dart.ide.actions.DartPubActionBase.Companion.showPubOutputConsole(Module, GeneralCommandLine, OSProcessHandler, VirtualFile, String, Continuation) : Object. This interface is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the class is not supposed to be used in client code.
83+
* Internal method com.intellij.openapi.components.ComponentManagerEx.getServiceAsync(java.lang.Class keyClass, kotlin.coroutines.Continuation $completion) : java.lang.Object is invoked in com.jetbrains.lang.dart.ide.actions.DartPubActionBase.Companion.showPubOutputConsole(Module, GeneralCommandLine, OSProcessHandler, VirtualFile, String, Continuation) : Object. This method is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the method is not supposed to be used in client code.
8284
* Internal method com.intellij.psi.impl.include.FileIncludeProvider.acceptFile(com.intellij.openapi.vfs.VirtualFile arg0) : boolean is overridden in class com.jetbrains.lang.dart.psi.DartPackageAwareFileIncludeProvider. This method is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the method is not supposed to be used in client code.
8385
* Internal method com.intellij.psi.impl.include.FileIncludeProvider.getId() : java.lang.String is overridden in class com.jetbrains.lang.dart.psi.DartPackageAwareFileIncludeProvider. This method is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the method is not supposed to be used in client code.
8486
* Internal method com.intellij.psi.impl.include.FileIncludeProvider.getIncludeInfos(com.intellij.util.indexing.FileContent arg0) : com.intellij.psi.impl.include.FileIncludeInfo[] is overridden in class com.jetbrains.lang.dart.psi.DartPackageAwareFileIncludeProvider. This method is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the method is not supposed to be used in client code.

‎third_party/tool/baseline/252/verifier-baseline.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* Experimental API class com.redhat.devtools.lsp4ij.client.features.LSPClientFeatures is referenced in com.jetbrains.lang.dart.lsp.DartLspClientFeatures.createLauncherBuilder() : Launcher.Builder. This class can be changed in a future release leading to incompatibilities
5858
* Experimental API constructor com.redhat.devtools.lsp4ij.client.features.LSPClientFeatures.<init>() is invoked in com.jetbrains.lang.dart.lsp.DartLspClientFeatures.<init>(). This constructor can be changed in a future release leading to incompatibilities
5959
* Experimental API method com.intellij.openapi.command.CoroutinesKt.writeCommandAction(com.intellij.openapi.project.Project project, java.lang.String commandName, kotlin.jvm.functions.Function0 action, kotlin.coroutines.Continuation $completion) : java.lang.Object is invoked in com.jetbrains.lang.dart.analyzer.DartAnalysisServerImpl.lsp_workspaceApplyEdit$1.invokeSuspend(Object) : Object. This method can be changed in a future release leading to incompatibilities
60-
* Experimental API method com.intellij.openapi.components.ServicesKt.serviceAsync(com.intellij.openapi.components.ComponentManager $this$serviceAsync, java.lang.Class keyClass, kotlin.coroutines.Continuation $completion) : java.lang.Object is invoked in com.jetbrains.lang.dart.ide.actions.DartPubActionBase.Companion.showPubOutputConsole(Module, GeneralCommandLine, OSProcessHandler, VirtualFile, String, Continuation) : Object. This method can be changed in a future release leading to incompatibilities
60+
* Experimental API method com.intellij.openapi.components.ComponentManagerEx.getServiceAsync(java.lang.Class keyClass, kotlin.coroutines.Continuation $completion) : java.lang.Object is invoked in com.jetbrains.lang.dart.ide.actions.DartPubActionBase.Companion.showPubOutputConsole(Module, GeneralCommandLine, OSProcessHandler, VirtualFile, String, Continuation) : Object. This method can be changed in a future release leading to incompatibilities
6161
* Experimental API method com.intellij.openapi.vfs.newvfs.events.VFilePropertyChangeEvent.isRename() : boolean is invoked in com.jetbrains.lang.dart.DartFileListener.prepareChange(List) : AsyncFileListener.ChangeApplier. This method can be changed in a future release leading to incompatibilities
6262
* Experimental API method com.redhat.devtools.lsp4ij.client.features.LSPClientFeatures.createLauncherBuilder() : org.eclipse.lsp4j.jsonrpc.Launcher.Builder is overridden in class com.jetbrains.lang.dart.lsp.DartLspClientFeatures. This method can be changed in a future release leading to incompatibilities
6363
* Experimental API method com.redhat.devtools.lsp4ij.client.features.LSPClientFeatures.getProject() : com.intellij.openapi.project.Project is invoked in com.jetbrains.lang.dart.lsp.DartLauncherBuilder.createMessageProducer(InputStream, MessageJsonHandler, MessageIssueHandler) : MessageProducer. This method can be changed in a future release leading to incompatibilities
@@ -79,6 +79,8 @@
7979
* Internal field com.intellij.psi.impl.include.FileIncludeInfo.EMPTY : com.intellij.psi.impl.include.FileIncludeInfo[] is accessed in com.jetbrains.lang.dart.psi.DartPackageAwareFileIncludeProvider.getIncludeInfos(FileContent) : FileIncludeInfo[]. This field is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the field is not supposed to be used in client code.
8080
* Internal field com.intellij.psi.impl.include.FileIncludeInfo.EMPTY : com.intellij.psi.impl.include.FileIncludeInfo[] is accessed in com.jetbrains.lang.dart.psi.DartPackageAwareFileIncludeProvider.getIncludeInfos(XmlFile) : FileIncludeInfo[]. This field is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the field is not supposed to be used in client code.
8181
* Internal field com.intellij.psi.impl.include.FileIncludeInfo.path : java.lang.String is accessed in com.jetbrains.lang.dart.psi.DartPackageAwareFileIncludeProvider.resolveIncludedFile(FileIncludeInfo, PsiFile) : PsiFileSystemItem. This field is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the field is not supposed to be used in client code.
82+
* Internal interface com.intellij.openapi.components.ComponentManagerEx is referenced in com.jetbrains.lang.dart.ide.actions.DartPubActionBase.Companion.showPubOutputConsole(Module, GeneralCommandLine, OSProcessHandler, VirtualFile, String, Continuation) : Object. This interface is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the class is not supposed to be used in client code.
83+
* Internal method com.intellij.openapi.components.ComponentManagerEx.getServiceAsync(java.lang.Class keyClass, kotlin.coroutines.Continuation $completion) : java.lang.Object is invoked in com.jetbrains.lang.dart.ide.actions.DartPubActionBase.Companion.showPubOutputConsole(Module, GeneralCommandLine, OSProcessHandler, VirtualFile, String, Continuation) : Object. This method is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the method is not supposed to be used in client code.
8284
* Internal method com.intellij.psi.impl.include.FileIncludeProvider.acceptFile(com.intellij.openapi.vfs.VirtualFile arg0) : boolean is overridden in class com.jetbrains.lang.dart.psi.DartPackageAwareFileIncludeProvider. This method is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the method is not supposed to be used in client code.
8385
* Internal method com.intellij.psi.impl.include.FileIncludeProvider.getId() : java.lang.String is overridden in class com.jetbrains.lang.dart.psi.DartPackageAwareFileIncludeProvider. This method is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the method is not supposed to be used in client code.
8486
* Internal method com.intellij.psi.impl.include.FileIncludeProvider.getIncludeInfos(com.intellij.util.indexing.FileContent arg0) : com.intellij.psi.impl.include.FileIncludeInfo[] is overridden in class com.jetbrains.lang.dart.psi.DartPackageAwareFileIncludeProvider. This method is marked with @org.jetbrains.annotations.ApiStatus.Internal annotation or @com.intellij.openapi.util.IntellijInternalApi annotation and indicates that the method is not supposed to be used in client code.

0 commit comments

Comments
 (0)