From caa4fd0765e1fe7d86747226d685b41d93895f96 Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Mon, 11 Feb 2013 16:05:16 +0400 Subject: [PATCH 1/5] Temporary comment bad code. --- .../idea/maven/importing/MavenModuleImporter.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java index 415f67c6e1a9..35a468cd368a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java @@ -418,11 +418,11 @@ public class MavenModuleImporter { String encoding = myMavenProject.getEncoding(); if (encoding != null) { - try { - EncodingProjectManager.getInstance(myModule.getProject()).setEncoding(myMavenProject.getDirectoryFile(), Charset.forName(encoding)); - } - catch (UnsupportedCharsetException ignored) {/**/} - catch (IllegalCharsetNameException ignored) {/**/} + //try { + // EncodingProjectManager.getInstance(myModule.getProject()).setEncoding(myMavenProject.getDirectoryFile(), Charset.forName(encoding)); + //} + //catch (UnsupportedCharsetException ignored) {/**/} + //catch (IllegalCharsetNameException ignored) {/**/} } } From e8425f3f2b1c86bf744df7a190da702b5bba42f6 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Fri, 8 Feb 2013 19:24:49 +0400 Subject: [PATCH 2/5] Use text attribute inheritance from LanguageDefaults --- .../lang/properties/PropertiesHighlighter.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/properties/src/com/intellij/lang/properties/PropertiesHighlighter.java b/plugins/properties/src/com/intellij/lang/properties/PropertiesHighlighter.java index f2240809edf7..c1db84915e8c 100644 --- a/plugins/properties/src/com/intellij/lang/properties/PropertiesHighlighter.java +++ b/plugins/properties/src/com/intellij/lang/properties/PropertiesHighlighter.java @@ -18,6 +18,7 @@ package com.intellij.lang.properties; import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.lang.properties.parsing.PropertiesTokenTypes; import com.intellij.lexer.Lexer; +import com.intellij.openapi.editor.DefaultLanguageHighlighterColors; import com.intellij.openapi.editor.SyntaxHighlighterColors; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.fileTypes.SyntaxHighlighterBase; @@ -44,30 +45,30 @@ public class PropertiesHighlighter extends SyntaxHighlighterBase { public static final TextAttributesKey PROPERTY_KEY = TextAttributesKey.createTextAttributesKey( "PROPERTIES.KEY", - SyntaxHighlighterColors.KEYWORD.getDefaultAttributes() + DefaultLanguageHighlighterColors.KEYWORD ); public static final TextAttributesKey PROPERTY_VALUE = TextAttributesKey.createTextAttributesKey( "PROPERTIES.VALUE", - SyntaxHighlighterColors.STRING.getDefaultAttributes() + DefaultLanguageHighlighterColors.STRING ); public static final TextAttributesKey PROPERTY_COMMENT = TextAttributesKey.createTextAttributesKey( "PROPERTIES.LINE_COMMENT", - SyntaxHighlighterColors.LINE_COMMENT.getDefaultAttributes() + DefaultLanguageHighlighterColors.LINE_COMMENT ); public static final TextAttributesKey PROPERTY_KEY_VALUE_SEPARATOR = TextAttributesKey.createTextAttributesKey( "PROPERTIES.KEY_VALUE_SEPARATOR", - SyntaxHighlighterColors.OPERATION_SIGN.getDefaultAttributes() + DefaultLanguageHighlighterColors.OPERATION_SIGN ); public static final TextAttributesKey PROPERTIES_VALID_STRING_ESCAPE = TextAttributesKey.createTextAttributesKey( "PROPERTIES.VALID_STRING_ESCAPE", - SyntaxHighlighterColors.VALID_STRING_ESCAPE.getDefaultAttributes() + DefaultLanguageHighlighterColors.VALID_STRING_ESCAPE ); public static final TextAttributesKey PROPERTIES_INVALID_STRING_ESCAPE = TextAttributesKey.createTextAttributesKey( "PROPERTIES.INVALID_STRING_ESCAPE", - SyntaxHighlighterColors.INVALID_STRING_ESCAPE.getDefaultAttributes() + DefaultLanguageHighlighterColors.INVALID_STRING_ESCAPE ); static { From 91ba633842cbc029ccfc48224ecf5c9af0b54589 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 11 Feb 2013 13:36:30 +0100 Subject: [PATCH 3/5] add license information for JSR-305 library --- build/scripts/libLicenses.gant | 1 + 1 file changed, 1 insertion(+) diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index 7ca53838fb6a..0913e62803da 100644 --- a/build/scripts/libLicenses.gant +++ b/build/scripts/libLicenses.gant @@ -248,6 +248,7 @@ libraryLicense(name: "Cucumber-Groovy", libraryName: "cucumber-groovy", version: libraryLicense(name: "proxy-vole", libraryName: "proxy-vole", version: "20120920", license: "New BSD License", url: "http://code.google.com/p/proxy-vole/", licenseUrl: "http://opensource.org/licenses/BSD-3-Clause") libraryLicense(name: "Rhino JavaScript Engine", libraryName: "rhino-js-1_7R4", version: "1.7R4", license: "MPL 1.1", url: "http://www.mozilla.org/rhino/", licenseUrl: "http://www.mozilla.org/MPL/MPL-1.1.html") libraryLicense(name: "asm-4.0-all", libraryName: "asm-4.0-all", version: "4.0", attachedTo: "ByteCodeViewer", license: "BSD", url: "http://asm.objectweb.org/", licenseUrl: "http://asm.objectweb.org/license.html") +libraryLicense(name: "jsr305", libraryName: "jsr305", version: "snapshot", license: "BSD", url: "http://code.google.com/p/jsr-305/", licenseUrl: "http://code.google.com/p/jsr-305/source/browse/trunk/ri/LICENSE") jetbrainsLibrary("JPS") jetbrainsLibrary("Maven Embedder") jetbrainsLibrary("tcServiceMessages") From 073560f12d41661ff0d00f68c93405e2f3c9136a Mon Sep 17 00:00:00 2001 From: "Nadya.Zabrodina" Date: Mon, 11 Feb 2013 16:46:03 +0400 Subject: [PATCH 4/5] IDEA-100425 Mercurial integration: generate wrong string for log from revision *Change log argumets: "log -r r1:" -> "log -r tip:r1", because in first case hg returns the items in reverse order.(this was not to cause errors) --- .../zmlx/hg4idea/provider/HgCachingCommitedChangesProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCachingCommitedChangesProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCachingCommitedChangesProvider.java index e6e76934febc..dbdfc66b7b02 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCachingCommitedChangesProvider.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgCachingCommitedChangesProvider.java @@ -204,7 +204,7 @@ public class HgCachingCommitedChangesProvider implements CachingCommittedChanges if (changeBrowserSettings != null) { args = new ArrayList(); if (changeBrowserSettings.USE_CHANGE_AFTER_FILTER) { - args.add("-r " + changeBrowserSettings.getChangeAfterFilter() + ":"); + args.add("-r tip:" + changeBrowserSettings.getChangeAfterFilter()); } } final List localRevisions; From 36fc2bee83c9115e0a3cad9f85b881b0daf0aaa9 Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Mon, 11 Feb 2013 16:54:33 +0400 Subject: [PATCH 5/5] IDEA-100647 'this' is not available in Grails debugging --- .../plugins/groovy/debugger/GroovyCodeFragmentFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java index 8491aafabd19..03e93347c741 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/debugger/GroovyCodeFragmentFactory.java @@ -127,7 +127,7 @@ public class GroovyCodeFragmentFactory extends CodeFragmentFactory { javaText.append( "if (java.util.Arrays.toString(new Exception().getStackTrace()).matches(\"\\\\[([^,()]+\\\\$\\\\$)[A-Za-z0-9]{8}(\\\\.[^,()]+)\\\\(") .append(s) - .append(":\\\\d+\\\\), (\\\\1[A-Za-z0-9]{8}\\\\2\\\\(Unknown Source\\\\), $OR$.+(?:com|org)\\\\.springsource\\\\.loaded\\\\.).+\")) {\n"); + .append(":\\\\d+\\\\), (\\\\1[A-Za-z0-9]{8}\\\\2\\\\(Unknown Source\\\\), $OR$.+(?:com$OR$org)\\\\.springsource\\\\.loaded\\\\.).+\")) {\n"); javaText.append(" |thiz0 = thiz;\n"); javaText.append(" } else {\n"); javaText.append(" |thiz0 = this;\n");