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:
Dmitry Jemerov
2012-08-28 19:23:06 +02:00
parent 1b709d3407 3871749143
commit 5eabb7abc1
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/helpers/icons/PythonHelpersIcons.java
+14
View File
@@ -0,0 +1,14 @@
package icons;
import com.intellij.openapi.util.IconLoader;
import javax.swing.*;
/**
* NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
* Don't repeat mistakes of others ;-)
*/
public class PythonHelpersIcons {
public static final Icon Keybd_closed = IconLoader.getIcon("/coverage/htmlfiles/keybd_closed.png"); // 35x12
public static final Icon Keybd_open = IconLoader.getIcon("/coverage/htmlfiles/keybd_open.png"); // 35x12
}
python/python-helpers.iml
+1
View File
@@ -7,6 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="util" />
</component>
</module>
python/rest/src/icons/RestIcons.java
+13
View File
@@ -0,0 +1,13 @@
package icons;
import com.intellij.openapi.util.IconLoader;
import javax.swing.*;
/**
* NOTE THIS FILE IS AUTO-GENERATED by the build/scripts/icons.gant
* Don't repeat mistakes of others ;-)
*/
public class RestIcons {
public static final Icon Rst = IconLoader.getIcon("/com/jetbrains/rest/res/rst.png"); // 16x16
}
python/src/com/jetbrains/python/codeInsight/intentions/TypeAssertionIntention.java
+1 -2
View File
@@ -95,7 +95,7 @@ public class TypeAssertionIntention implements IntentionAction {
final Document document = editor.getDocument();
if (statementList != null) {
PsiElement statementListParent = statementList.getParent();
PsiElement statementListParent = PsiTreeUtil.getParentOfType(statementList, PyStatement.class);
if (document.getLineNumber(statementList.getTextOffset()) ==
document.getLineNumber(statementListParent.getTextOffset())) {
final String substring =
@@ -105,7 +105,6 @@ public class TypeAssertionIntention implements IntentionAction {
text + "\n\t" + statementList.getText());
statementListParent = statementListParent.replace(foo);
statementListParent = CodeInsightUtilBase.forcePsiPostprocessAndRestoreElement(statementListParent);
statementList = PsiTreeUtil.findChildOfType(statementListParent, PyStatementList.class);
element = statementList.getStatements()[0];
}