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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yann Cébron
2016-08-30 12:50:41 +02:00
parent dcd8a54fea 77d55c4442
commit a5cf1ca326
11 changed files with 27 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/groovy/org/jetbrains/intellij/build/impl/LayoutBuilder.groovy
+4 -16
View File
@@ -13,21 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.intellij.build.impl
import com.intellij.openapi.util.MultiValuesMap
@@ -196,7 +184,7 @@ class LayoutBuilder {
}
}
def JpsModule findModule(String name) {
JpsModule findModule(String name) {
def module = project.modules.find { it.name == name }
if (module == null) {
throw new IllegalArgumentException("Cannot find module '$name' in the project")
java/java-tests/testSrc/com/intellij/codeInsight/OverrideImplementTest.groovy
+4 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ interface B extends A {
""").containingFile.virtualFile
myFixture.configureFromExistingVirtualFile(file)
def Presentation presentation = new Presentation()
Presentation presentation = new Presentation()
presentation.setText(ActionsBundle.message("action.ImplementMethods.text"))
CommandProcessor.instance.executeCommand(project, { invokeAction(true) }, presentation.text, null)
@@ -87,7 +87,7 @@ class C extends B implements A {
""").containingFile.virtualFile
myFixture.configureFromExistingVirtualFile(file)
def Presentation presentation = new Presentation()
Presentation presentation = new Presentation()
presentation.setText(ActionsBundle.message("action.ImplementMethods.text"))
CommandProcessor.instance.executeCommand(project, { invokeAction(true) }, presentation.text, null)
@@ -124,7 +124,7 @@ class B implements Main1.I, Main2.I {
""").containingFile.virtualFile
myFixture.configureFromExistingVirtualFile(file)
def Presentation presentation = new Presentation()
Presentation presentation = new Presentation()
presentation.setText(ActionsBundle.message("action.ImplementMethods.text"))
CommandProcessor.instance.executeCommand(project, { invokeAction(true) }, presentation.text, null)
java/java-tests/testSrc/com/intellij/codeInsight/editorActions/SelectionQuotingTest.groovy
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ var c = "test test test";\
doTest(initial, expected, action, TestFileType.JS)
}
def void doTest(initial, expected, action, fileType = TestFileType.JAVA) {
void doTest(initial, expected, action, fileType = TestFileType.JAVA) {
configureFromFileText("${getTestName(false)}.$fileType.extension", initial)
def settings = CodeInsightSettings.getInstance()
def old = settings.SURROUND_SELECTION_ON_QUOTE_TYPED
java/java-tests/testSrc/com/intellij/codeInsight/folding/JavaFolding8Test.groovy
+2 -2
View File
@@ -29,8 +29,8 @@ import org.jetbrains.annotations.NotNull
*/
public class JavaFolding8Test extends LightCodeInsightFixtureTestCase {
def JavaCodeFoldingSettingsImpl myFoldingSettings
def JavaCodeFoldingSettingsImpl myFoldingStateToRestore
JavaCodeFoldingSettingsImpl myFoldingSettings
JavaCodeFoldingSettingsImpl myFoldingStateToRestore
@NotNull
@Override
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/CopySpecWalker.groovy
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ class CopySpecWalker {
return
}
copySpec.walk({ def resolver ->
copySpec.walk({ resolver ->
// def resolver ->
// in Gradle v1.x - org.gradle.api.internal.file.copy.CopySpecInternal
// in Gradle v2.x - org.gradle.api.internal.file.copy.CopySpecResolver
@@ -73,7 +73,7 @@ class CopySpecWalker {
}
if (sourcePaths) {
(sourcePaths.flatten() as List).each { def path ->
(sourcePaths.flatten() as List).each { path ->
if (path instanceof String) {
visitor.visitSourcePath(relativePath, path)
}
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -868,7 +868,7 @@ class DependencyResolverImpl implements DependencyResolver {
sourcePaths = mainSpec.sourcePaths
}
if (sourcePaths) {
(sourcePaths.flatten() as List).each { def path ->
(sourcePaths.flatten() as List).each { path ->
if (path instanceof String) {
def file = new File(path)
if (file.isAbsolute()) {
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/psi/PsiMethodCategory.groovy
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ public class PsiMethodCategory implements PsiEnhancerCategory {
}
static Map getParamStringVector(PsiMethod method) {
def Map result = [:]
Map result = [:]
int idx = 1
for (p in method.parameterList.parameters) {
result.put("value$idx", p.getType().getCanonicalText())
plugins/groovy/src/META-INF/plugin.xml
+1 -1
View File
@@ -828,7 +828,7 @@
groupName="Style" enabledByDefault="false" level="WARNING"
implementationClass="org.jetbrains.plugins.groovy.codeInspection.style.JavaStylePropertiesInvocationInspection"/>
<localInspection language="Groovy" groupPath="Groovy" groupName="Style"
displayName="Unnecessary 'def'" cleanupTool="true"
displayName="Unnecessary 'def'" cleanupTool="true" enabledByDefault="true"
implementationClass="org.jetbrains.plugins.groovy.codeInspection.style.GrUnnecessaryDefModifierInspection"/>
<localInspection language="Groovy" groupPath="Groovy" groupName="Style"
displayName="Unnecessary 'public'" cleanupTool="true"
plugins/groovy/test/org/jetbrains/plugins/groovy/dsl/GroovyTransformationsTest.groovy
+3 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,7 +28,8 @@ import org.jetbrains.plugins.groovy.util.TestUtils
*/
class GroovyTransformationsTest extends LightCodeInsightFixtureTestCase {
static def descriptor = new DefaultLightProjectDescriptor() {
@Override def void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) {
@Override
void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model, @NotNull ContentEntry contentEntry) {
PsiTestUtil.addLibrary(module, model, "GROOVY", TestUtils.getMockGroovy1_7LibraryHome(), TestUtils.GROOVY_JAR_17);
}
}
plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/RemoveExplicitTypeDeclarationTest.groovy
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import org.jetbrains.plugins.groovy.util.TestUtils
* Created by Max Medvedev on 27/12/13
*/
class RemoveExplicitTypeDeclarationTest extends GrIntentionTestCase {
def RemoveExplicitTypeDeclarationTest() {
RemoveExplicitTypeDeclarationTest() {
super(GrRemoveExplicitTypeDeclarationIntention)
}
plugins/groovy/test/org/jetbrains/plugins/groovy/intentions/strings/RemoveUnnecessaryEscapedCharactersTest.groovy
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import org.jetbrains.plugins.groovy.intentions.conversions.strings.RemoveUnneces
* @author Max Medvedev
*/
class RemoveUnnecessaryEscapedCharactersTest extends GrIntentionTestCase {
def RemoveUnnecessaryEscapedCharactersTest() {
RemoveUnnecessaryEscapedCharactersTest() {
super(RemoveUnnecessaryEscapeCharactersIntention.HINT)
}