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:
Vladislav.Soroka
2013-09-02 13:16:31 +04:00
parent 4358f3fc76 c28ebf2080
commit 751525bcaf
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/openapi/vfs/JarFileSystemTest.java
+1
View File
@@ -68,6 +68,7 @@ public class JarFileSystemTest extends IdeaTestCase {
public void testJarRefresh() throws IOException {
File jar = IoTestUtil.createTestJar();
assertTrue(jar.setLastModified(jar.lastModified() - 1000));
VirtualFile vFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(jar);
assertNotNull(vFile);
xml/impl/src/com/intellij/codeInsight/editorActions/XmlSlashTypedHandler.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class XmlSlashTypedHandler extends TypedHandlerDelegate implements XmlTok
final String prevLeafText = prevLeaf.getText();
if ("</".equals(prevLeafText) && prevLeaf.getElementType() == XML_END_TAG_START) {
XmlTag tag = PsiTreeUtil.getParentOfType(element, XmlTag.class);
if (tag != null && StringUtil.isNotEmpty(tag.getName())) {
if (tag != null && StringUtil.isNotEmpty(tag.getName()) && TreeUtil.findSibling(prevLeaf, XmlTokenType.XML_NAME) == null) {
EditorModificationUtil.insertStringAtCaret(editor, tag.getName() + ">");
return Result.STOP;
}
xml/tests/src/com/intellij/codeInsight/completion/XmlTypedHandlersTest.java
+6
View File
@@ -29,4 +29,10 @@ public class XmlTypedHandlersTest extends LightPlatformCodeInsightFixtureTestCas
myFixture.type('/');
myFixture.checkResult("<foo></foo>");
}
public void testGreedyClosing() {
myFixture.configureByText(XmlFileType.INSTANCE, "<foo><<caret>foo>");
myFixture.type('/');
myFixture.checkResult("<foo></foo>");
}
}