Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Dart] Increase min SDK to last minor Dart 1 release #931

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Dart] Increase min SDK to last minor Dart 1 release #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Dart/src/com/jetbrains/lang/dart/analyzer/DartAnalysisServerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
import java.util.concurrent.TimeUnit;

public final class DartAnalysisServerService implements Disposable {
public static final String MIN_SDK_VERSION = "1.12";
public static final String MIN_SDK_VERSION = "1.24";
private static final String MIN_MOVE_FILE_SDK_VERSION = "2.3.2";
private static final String COMPLETION_2_SERVER_VERSION = "1.33";

Expand Down Expand Up @@ -1956,9 +1956,7 @@ private void analysis_setSubscriptions() {
subscriptions.put(AnalysisService.NAVIGATION, myVisibleFileUris);
subscriptions.put(AnalysisService.OVERRIDES, myVisibleFileUris);
subscriptions.put(AnalysisService.OUTLINE, myVisibleFileUris);
if (StringUtil.compareVersionNumbers(mySdkVersion, "1.13") >= 0) {
subscriptions.put(AnalysisService.IMPLEMENTED, myVisibleFileUris);
}
subscriptions.put(AnalysisService.IMPLEMENTED, myVisibleFileUris);
if (DartClosingLabelManager.getInstance().getShowClosingLabels()
&& StringUtil.compareVersionNumbers(mySdkVersion, "1.25.0") >= 0) {
subscriptions.put(AnalysisService.CLOSING_LABELS, myVisibleFileUris);
Expand Down
6 changes: 0 additions & 6 deletions .../jetbrains/lang/dart/ide/refactoring/introduce/DartServerExtractLocalVariableHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.jetbrains.lang.dart.ide.refactoring.ServerRefactoringDialog;
import com.jetbrains.lang.dart.ide.refactoring.status.RefactoringStatus;
import com.jetbrains.lang.dart.psi.DartExpression;
import com.jetbrains.lang.dart.sdk.DartSdk;
import org.dartlang.analysis.server.protocol.SourceChange;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand All @@ -45,11 +44,6 @@ public void invoke(@NotNull Project project, PsiElement @NotNull [] elements, Da

@Override
public void invoke(final @NotNull Project project, final Editor editor, PsiFile file, DataContext dataContext) {
final DartSdk sdk = DartSdk.getDartSdk(project);
if (sdk == null || StringUtil.compareVersionNumbers(sdk.getVersion(), "1.14") < 0) {
return;
}

if (editor == null || file == null) {
return;
}
Expand Down
6 changes: 0 additions & 6 deletions Dart/src/com/jetbrains/lang/dart/pubServer/PubServerPathHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import com.intellij.util.io.isRegularBrowser
import com.intellij.util.io.origin
import com.intellij.util.io.referrer
import com.intellij.util.io.userAgent
import com.jetbrains.lang.dart.sdk.DartSdk
import com.jetbrains.lang.dart.util.DartUrlResolver
import com.jetbrains.lang.dart.util.PubspecYamlUtil
import io.netty.channel.ChannelHandlerContext
Expand Down Expand Up @@ -49,11 +48,6 @@ private class PubServerPathHandler : WebServerPathHandlerAdapter() {
return false
}

val sdk = DartSdk.getDartSdk(project)
if (sdk == null || StringUtil.compareVersionNumbers(sdk.version, "1.6") < 0) {
return false
}

val servedDirAndPathForPubServer = getServedDirAndPathForPubServer(project, path) ?: return false
PubServerManager.getInstance(project).send(context.channel(), request, validateResult, servedDirAndPathForPubServer.first,
servedDirAndPathForPubServer.second)
Expand Down