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

IDEA-117857 Add exception type variable to "Catch Statement Body" template

Browse Source
This commit is contained in:
peter
2013-12-12 22:43:11 +01:00
parent 5ae8f86338
commit 82953ab838
6 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
+2 -1
View File
@@ -258,12 +258,13 @@ public class JavaPsiImplementationHelperImpl extends JavaPsiImplementationHelper
}
@Override
public void setupCatchBlock(String exceptionName, PsiElement context, PsiCatchSection catchSection) {
public void setupCatchBlock(@NotNull String exceptionName, @NotNull PsiType exceptionType, PsiElement context, @NotNull PsiCatchSection catchSection) {
final FileTemplate catchBodyTemplate = FileTemplateManager.getInstance().getCodeTemplate(JavaTemplateUtil.TEMPLATE_CATCH_BODY);
LOG.assertTrue(catchBodyTemplate != null);
final Properties props = new Properties();
props.setProperty(FileTemplate.ATTRIBUTE_EXCEPTION, exceptionName);
props.setProperty(FileTemplate.ATTRIBUTE_EXCEPTION_TYPE, exceptionType.getCanonicalText());
if (context != null && context.isPhysical()) {
final PsiDirectory directory = context.getContainingFile().getContainingDirectory();
if (directory != null) {
java/java-psi-impl/src/com/intellij/core/CoreJavaPsiImplementationHelper.java
+1 -1
View File
@@ -52,7 +52,7 @@ public class CoreJavaPsiImplementationHelper extends JavaPsiImplementationHelper
}
@Override
public void setupCatchBlock(String exceptionName, PsiElement context, PsiCatchSection element) {
public void setupCatchBlock(@NotNull String exceptionName, @NotNull PsiType exceptionType, PsiElement context, @NotNull PsiCatchSection element) {
throw new UnsupportedOperationException("TODO");
}
}
java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelper.java
+2 -1
View File
@@ -50,5 +50,6 @@ public abstract class JavaPsiImplementationHelper {
@Nullable
public abstract PsiElement getDefaultMemberAnchor(@NotNull PsiClass psiClass, @NotNull PsiMember firstPsi);
public abstract void setupCatchBlock(String exceptionName, PsiElement context, PsiCatchSection element);
public abstract void setupCatchBlock(@NotNull String exceptionName, @NotNull PsiType exceptionType,
@Nullable PsiElement context, @NotNull PsiCatchSection element);
}
java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java
+1 -1
View File
@@ -748,7 +748,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
final Project project = myManager.getProject();
final JavaPsiImplementationHelper helper = JavaPsiImplementationHelper.getInstance(project);
helper.setupCatchBlock(exceptionName, context, (PsiCatchSection)element);
helper.setupCatchBlock(exceptionName, exceptionType, context, (PsiCatchSection)element);
final CodeStyleManager styleManager = CodeStyleManager.getInstance(project);
final PsiCatchSection catchSection = (PsiCatchSection)styleManager.reformat(element);
platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplate.java
+1
View File
@@ -33,6 +33,7 @@ public interface FileTemplate extends Cloneable {
FileTemplate[] EMPTY_ARRAY = new FileTemplate[0];
String ATTRIBUTE_EXCEPTION = "EXCEPTION";
String ATTRIBUTE_EXCEPTION_TYPE = "EXCEPTION_TYPE";
String ATTRIBUTE_DESCRIPTION = "DESCRIPTION";
String ATTRIBUTE_DISPLAY_NAME = "DISPLAY_NAME";
resources-en/src/fileTemplates/code/Catch Statement Body.java.html
+5
View File
@@ -19,6 +19,11 @@
<td width="10">&nbsp;</td>
<td valign="top"><font face="verdana" size="-1">name of the <b>Exception</b> variable specified as a <b>catch</b> parameter</font></td>
</tr>
<tr>
<td valign="top"><nobr><font face="verdana" size="-2" ><b>${EXCEPTION_TYPE}</b></font></nobr></td>
<td width="10">&nbsp;</td>
<td valign="top"><font face="verdana" size="-1">type of the <b>catch</b> parameter</font></td>
</tr>
</table>
</body>
</html>