MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

ugly fixes for 2021.2 version: js, docker and yaml dependencies removed

Browse Source 
GitOrigin-RevId: d8e5d85c45ea778c7f9418849e1a33b4d4e926d2
This commit is contained in:
adelf
2021-06-11 13:39:27 +03:00
committed by intellij-monorepo-bot
parent 6b390f21ea
commit e46a38be43
14 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/env-files-support/build.gradle
+17 -10
View File
@@ -5,7 +5,13 @@ buildscript {
}
plugins {
id "org.jetbrains.intellij" version "0.4.9"
id "org.jetbrains.intellij" version "0.7.3"
}
repositories {
maven {
url "https://plugins.gradle.org/m2/"
}
}
sourceSets {
@@ -24,15 +30,15 @@ apply plugin: 'org.jetbrains.intellij'
apply plugin: 'java'
intellij {
version 'IU-193.6015.39'
version 'IU-212.4037.9-EAP-SNAPSHOT'
plugins = [
'com.jetbrains.php:193.6015.48',
'JavaScriptLanguage',
'com.jetbrains.php:212.4037.57',
//'JavaScriptLanguage',
'yaml',
'org.jetbrains.plugins.go:193.5662.53.103',
'org.jetbrains.plugins.go:212.4037.9',
'Docker',
'pythonid:193.6015.28',
'org.jetbrains.plugins.ruby:193.6015.9',
'pythonid:212.4037.9',
'org.jetbrains.plugins.ruby:212.4037.9',
'Kotlin',
'coverage',
'CSS',
@@ -44,7 +50,7 @@ intellij {
}
patchPluginXml {
sinceBuild '193'
sinceBuild '212'
untilBuild '212.*'
}
@@ -53,5 +59,6 @@ buildSearchableOptions {
}
group 'ru.adelf'
version '2021.2' // Plugin version
sourceCompatibility = 1.8
version '2021.2.212' // Plugin version
sourceCompatibility = 11
targetCompatibility = 11
plugins/env-files-support/gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/DotEnvSettings.java
+1 -2
View File
@@ -1,7 +1,6 @@
package ru.adelf.idea.dotenv;
import com.intellij.openapi.components.PersistentStateComponent;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.project.Project;
@@ -26,6 +25,6 @@ public class DotEnvSettings implements PersistentStateComponent<DotEnvSettings>
}
public static DotEnvSettings getInstance(Project project) {
return ServiceManager.getService(project, DotEnvSettings.class);
return project.getService(DotEnvSettings.class);
}
}
plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeKeyGotoHandler.java
+2
View File
@@ -1,3 +1,4 @@
/*
package ru.adelf.idea.dotenv.docker;
import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler;
@@ -77,3 +78,4 @@ public class DockerComposeKeyGotoHandler implements GotoDeclarationHandler {
return null;
}
}
*/
plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlPsiElementsVisitor.java
+10 -4
View File
@@ -1,3 +1,4 @@
/*
package ru.adelf.idea.dotenv.docker;
import com.intellij.psi.PsiElement;
@@ -48,12 +49,14 @@ class DockerComposeYamlPsiElementsVisitor extends PsiRecursiveElementVisitor {
}
}
/**
*/
/**
* FOO:
* - foobar
* <p>
* FOO: [foobar]
*/
*//*
@NotNull
private Collection<YAMLSequenceItem> getSequenceItems(@NotNull YAMLKeyValue yamlKeyValue) {
PsiElement yamlSequence = yamlKeyValue.getLastChild();
@@ -65,10 +68,12 @@ class DockerComposeYamlPsiElementsVisitor extends PsiRecursiveElementVisitor {
return Collections.emptyList();
}
/**
*/
/**
* FOO:
* bar: true
*/
*//*
@NotNull
private Collection<YAMLKeyValue> getMappingItems(@NotNull YAMLKeyValue yamlKeyValue) {
PsiElement yamlMapping = yamlKeyValue.getLastChild();
@@ -80,3 +85,4 @@ class DockerComposeYamlPsiElementsVisitor extends PsiRecursiveElementVisitor {
return Collections.emptyList();
}
}
*/
plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerComposeYamlVariablesProvider.java
+2
View File
@@ -1,3 +1,4 @@
/*
package ru.adelf.idea.dotenv.docker;
import com.intellij.openapi.vfs.VirtualFile;
@@ -37,3 +38,4 @@ public class DockerComposeYamlVariablesProvider implements EnvironmentVariablesP
return Collections.emptyList();
}
}
*/
plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileKeyGotoHandler.java
+3 -1
View File
@@ -1,9 +1,10 @@
/*
package ru.adelf.idea.dotenv.docker;
import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler;
import com.intellij.docker.dockerFile.parser.psi.DockerFileEnvRegularDeclaration;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Editor;
import com.intellij.plugins.docker.dockerFile.parser.psi.DockerFileEnvRegularDeclaration;
import com.intellij.psi.PsiElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -39,3 +40,4 @@ public class DockerfileKeyGotoHandler implements GotoDeclarationHandler {
return null;
}
}
*/
plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfilePsiElementsVisitor.java
+3 -1
View File
@@ -1,6 +1,7 @@
/*
package ru.adelf.idea.dotenv.docker;
import com.intellij.plugins.docker.dockerFile.parser.psi.DockerFileEnvRegularDeclaration;
import com.intellij.docker.dockerFile.parser.psi.DockerFileEnvRegularDeclaration;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiRecursiveElementVisitor;
import org.apache.commons.lang.StringUtils;
@@ -34,3 +35,4 @@ class DockerfilePsiElementsVisitor extends PsiRecursiveElementVisitor {
return collectedItems;
}
}
*/
plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/docker/DockerfileVariablesProvider.java
+2
View File
@@ -1,3 +1,4 @@
/*
package ru.adelf.idea.dotenv.docker;
import com.intellij.docker.dockerFile.DockerFileType;
@@ -32,3 +33,4 @@ public class DockerfileVariablesProvider implements EnvironmentVariablesProvider
return Collections.emptyList();
}
}
*/
plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvCompletionProvider.java
+2 -1
View File
@@ -1,3 +1,4 @@
/*
package ru.adelf.idea.dotenv.js;
import com.intellij.codeInsight.completion.CompletionParameters;
@@ -57,4 +58,4 @@ public class JsEnvCompletionProvider extends BaseEnvCompletionProvider implement
public String getActionText(@NotNull DataContext dataContext) {
return null;
}
}
}*/
plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvironmentCallsVisitor.java
+2
View File
@@ -1,3 +1,4 @@
/*
package ru.adelf.idea.dotenv.js;
import com.intellij.lang.javascript.psi.JSReferenceExpression;
@@ -31,3 +32,4 @@ class JsEnvironmentCallsVisitor extends PsiRecursiveElementVisitor {
return collectedItems;
}
}
*/
plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsEnvironmentVariablesUsagesProvider.java
+2
View File
@@ -1,3 +1,4 @@
/*
package ru.adelf.idea.dotenv.js;
import com.intellij.lang.javascript.JavaScriptFileType;
@@ -32,3 +33,4 @@ public class JsEnvironmentVariablesUsagesProvider implements EnvironmentVariable
return Collections.emptyList();
}
}
*/
plugins/env-files-support/src/main/java/ru/adelf/idea/dotenv/js/JsPsiHelper.java
+2 -9
View File
@@ -1,3 +1,4 @@
/*
package ru.adelf.idea.dotenv.js;
import com.intellij.lang.javascript.psi.JSReferenceExpression;
@@ -9,10 +10,6 @@ import org.jetbrains.annotations.Nullable;
class JsPsiHelper {
/**
* @param psiElement checking element
* @return true if this is process.env.*** variable
*/
static boolean checkPsiElement(@NotNull PsiElement psiElement) {
if(!(psiElement instanceof LeafPsiElement)) {
return false;
@@ -31,11 +28,6 @@ class JsPsiHelper {
return ((JSReferenceExpression) parent).getCanonicalText().startsWith("process.env");
}
/**
* Checks whole process.env.SOME_KEY reference element
* @param referenceExpression checking expression
* @return null or Environment key
*/
@Nullable
static String checkReferenceExpression(@NotNull JSReferenceExpression referenceExpression) {
String text = referenceExpression.getCanonicalText();
@@ -47,3 +39,4 @@ class JsPsiHelper {
return text.substring(12);
}
}
*/
plugins/env-files-support/src/main/resources/META-INF/plugin.xml
+3 -3
View File
@@ -69,11 +69,11 @@
<depends optional="true" config-file="php.xml">com.jetbrains.php</depends>
<depends optional="true" config-file="ruby.xml">com.intellij.modules.ruby</depends>
<depends optional="true" config-file="python.xml">com.intellij.modules.python</depends>
<depends optional="true" config-file="js.xml">JavaScript</depends>
<!--<depends optional="true" config-file="js.xml">JavaScript</depends>-->
<depends optional="true" config-file="go.xml">org.jetbrains.plugins.go</depends>
<depends optional="true" config-file="docker.xml">Docker</depends>
<depends optional="true" config-file="yaml.xml">org.jetbrains.plugins.yaml</depends>
<!--<depends optional="true" config-file="docker.xml">Docker</depends>-->
<!--<depends optional="true" config-file="yaml.xml">org.jetbrains.plugins.yaml</depends>-->
<extensions defaultExtensionNs="com.intellij">
<projectService serviceImplementation="ru.adelf.idea.dotenv.DotEnvSettings"/>