MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

default namespace insertion fixed

Browse Source
This commit is contained in:
Dmitry Avdeev
2011-11-18 19:02:15 +04:00
parent fc0162b91a
commit f64139a23d
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
View File

@@ -212,7 +212,7 @@ public abstract class CodeInsightTestCase extends PsiTestCase {
PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
}
protected VirtualFile configureByFiles(final File rawProjectRoot, final VirtualFile... vFiles) throws IOException {
protected VirtualFile configureByFiles(@Nullable final File rawProjectRoot, final VirtualFile... vFiles) throws IOException {
myFile = null;
myEditor = null;

14
xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/CreateNSDeclarationIntentionFix.java
View File

@@ -147,18 +147,16 @@ public class CreateNSDeclarationIntentionFix implements HintAction, LocalQuickFi
final XmlFile xmlFile = extension.getContainingFile(myElement);
prefix = ExtendedTagInsertHandler.getPrefixByNamespace(xmlFile, namespace);
if (StringUtil.isNotEmpty(prefix)) {
// namespace already declared
ExtendedTagInsertHandler.qualifyWithPrefix(prefix, myElement);
return;
} else {
}
else {
prefix = ExtendedTagInsertHandler.suggestPrefix(xmlFile, namespace);
if (StringUtil.isEmpty(prefix)) {
if (!ApplicationManager.getApplication().isUnitTestMode()) {
HintManager.getInstance().showInformationHint(editor, "Namespace not found");
}
return;
if (!StringUtil.isEmpty(prefix)) {
ExtendedTagInsertHandler.qualifyWithPrefix(prefix, myElement);
PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument());
}
ExtendedTagInsertHandler.qualifyWithPrefix(prefix, myElement);
PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument());
}
}
final int offset = editor.getCaretModel().getOffset();