From a18a75646602970079e8314e152ead631a9e9913 Mon Sep 17 00:00:00 2001
From: Maxim Stefanov <stefanov@viva64.com>
Date: Thu, 12 Dec 2019 15:12:26 +0300
Subject: [PATCH 1/2] fix: NullPointerException in the 'insertCommentInAST'
 method for an empty switch

---
 .../spoon/support/compiler/jdt/JDTCommentBuilder.java  |  6 ++++++
 src/test/java/spoon/test/comment/CommentTest.java      | 10 ++++++++--
 .../comment/testclasses/EmptyStatementComments.java    | 10 ++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/spoon/support/compiler/jdt/JDTCommentBuilder.java b/src/main/java/spoon/support/compiler/jdt/JDTCommentBuilder.java
index 2b1cbc218ec..10b47baad6e 100644
--- a/src/main/java/spoon/support/compiler/jdt/JDTCommentBuilder.java
+++ b/src/main/java/spoon/support/compiler/jdt/JDTCommentBuilder.java
@@ -351,6 +351,12 @@ public <T> void scanCtVariable(CtVariable<T> e) {
 			public <E> void visitCtSwitch(CtSwitch<E> e) {
 				List<CtCase<? super E>> cases = e.getCases();
 				CtCase previous = null;
+
+				if (cases.isEmpty()) {
+					e.addComment(comment);
+					return;
+				}
+
 				for (CtCase<? super E> ctCase : cases) {
 					if (previous == null) {
 						if (comment.getPosition().getSourceStart() < ctCase.getPosition().getSourceStart()
diff --git a/src/test/java/spoon/test/comment/CommentTest.java b/src/test/java/spoon/test/comment/CommentTest.java
index 60c3816f602..4a6977d6df7 100644
--- a/src/test/java/spoon/test/comment/CommentTest.java
+++ b/src/test/java/spoon/test/comment/CommentTest.java
@@ -1120,6 +1120,7 @@ public void testCommentGetRawContent() {
 				" * @version 1.0\r" + 
 				" */", type.getComments().get(0).getRawContent());
 	}
+
 	@Test
 	public void testEmptyStatementComments() {
 		//contract: model building should not produce NPE, comments should exist
@@ -1127,10 +1128,15 @@ public void testEmptyStatementComments() {
 		launcher.addInputResource("./src/test/java/spoon/test/comment/testclasses/EmptyStatementComments.java");
 		launcher.getEnvironment().setCommentEnabled(true);
 
-		CtModel model = launcher.buildModel();
-		List<CtIf> conditions = model.getElements(new TypeFilter<>(CtIf.class));
+		List<CtMethod<?>> methods = launcher.buildModel().getElements(new TypeFilter<>(CtMethod.class));
+
+		List<CtIf> conditions = methods.get(0).getElements(new TypeFilter<>(CtIf.class));
 		assertEquals("comment", conditions.get(0).getComments().get(0).getContent());
 		assertEquals("comment", conditions.get(1).getComments().get(0).getContent());
+
+		List<CtSwitch<?>> switches = methods.get(1).getElements(new TypeFilter<>(CtSwitch.class));
+		assertEquals("commentInline", switches.get(0).getComments().get(0).getContent());
+		assertEquals("commentBlock", switches.get(1).getComments().get(0).getContent());
 	}
 
 	@Test
diff --git a/src/test/java/spoon/test/comment/testclasses/EmptyStatementComments.java b/src/test/java/spoon/test/comment/testclasses/EmptyStatementComments.java
index 2339b5e73fb..b9f3da6ad6c 100644
--- a/src/test/java/spoon/test/comment/testclasses/EmptyStatementComments.java
+++ b/src/test/java/spoon/test/comment/testclasses/EmptyStatementComments.java
@@ -8,4 +8,14 @@ void m1() {
         if (true) /* comment */
             ;
     }
+
+    void m2(int value) {
+        switch (value) {
+            // commentInline
+        }
+
+        switch (value) {
+            /* commentBlock */
+        }
+    }
 }

From a7e5a228fec6dfcd44dacd8707e228eb5c8fd82c Mon Sep 17 00:00:00 2001
From: Maxim Stefanov <stefanov@viva64.com>
Date: Thu, 12 Dec 2019 16:35:44 +0300
Subject: [PATCH 2/2] fix: NullPointerException in the 'insertCommentInAST'
 method for an empty switch

---
 .../spoon/support/compiler/jdt/JDTCommentBuilder.java     | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/main/java/spoon/support/compiler/jdt/JDTCommentBuilder.java b/src/main/java/spoon/support/compiler/jdt/JDTCommentBuilder.java
index 10b47baad6e..10bc6404352 100644
--- a/src/main/java/spoon/support/compiler/jdt/JDTCommentBuilder.java
+++ b/src/main/java/spoon/support/compiler/jdt/JDTCommentBuilder.java
@@ -351,12 +351,6 @@ public <T> void scanCtVariable(CtVariable<T> e) {
 			public <E> void visitCtSwitch(CtSwitch<E> e) {
 				List<CtCase<? super E>> cases = e.getCases();
 				CtCase previous = null;
-
-				if (cases.isEmpty()) {
-					e.addComment(comment);
-					return;
-				}
-
 				for (CtCase<? super E> ctCase : cases) {
 					if (previous == null) {
 						if (comment.getPosition().getSourceStart() < ctCase.getPosition().getSourceStart()
@@ -378,7 +372,7 @@ public <E> void visitCtSwitch(CtSwitch<E> e) {
 					}
 					previous = ctCase;
 				}
-				if (previous.getPosition().getSourceEnd() < comment.getPosition().getSourceStart()) {
+				if (previous != null && previous.getPosition().getSourceEnd() < comment.getPosition().getSourceStart()) {
 					addCommentToNear(comment, new ArrayList<>(previous.getStatements()));
 					try {
 						comment.getParent();