Merge branch 'IdeaEnhancedSwitchMigration' into 'master'

JDK 17: idea inspection enabled: Statement can be replaced with enhanced 'switch' See merge request exedio/jspm!10
exedio · Sep 11, 2024 · f2bea7c · f2bea7c
2 parents bb7cce1 + 51d3722
commit f2bea7c
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 47 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/src/com/exedio/jspm/Compiler.java b/src/com/exedio/jspm/Compiler.java
@@ -117,104 +117,104 @@ private void translate(final AtomicInteger count) throws IOException
 
 				switch(state)
 				{
-					case HTML:
+					case HTML -> {
 						switch(c)
 						{
-							case '<':
+							case '<' -> {
 								state = State.HTML_LESS;
 								cback = c;
-								break;
-							case '"':
+							}
+							case '"' -> {
 								if((htmlCharCount++)==0)
 									o.write(prefixStatic);
 								o.write("\\\"");
 								o.flushBuffer();
-								break;
-							case '\t':
+							}
+							case '\t' -> {
 								if((htmlCharCount++)==0)
 									o.write(prefixStatic);
 								o.write("\\t");
-								break;
-							case '\n':
+							}
+							case '\n' -> {
 								if((htmlCharCount++)==0)
 									o.write(prefixStatic);
 								o.write("\\n"+METHOD_STRING_BREAK);
-								break;
-							case '\\':
+							}
+							case '\\' -> {
 								if((htmlCharCount++)==0)
 									o.write(prefixStatic);
 								o.write("\\\\");
 								o.flushBuffer();
-								break;
-							default:
+							}
+							default -> {
 								if((htmlCharCount++)==0)
 									o.write(prefixStatic);
 								o.write(c);
 								o.flushBuffer();
-								break;
+							}
 						}
-						break;
-					case HTML_LESS:
+					}
+					case HTML_LESS -> {
 						switch(c)
 						{
-							case '%':
+							case '%' -> {
 								state = State.JAVA_FIRST;
 								expression = false;
 								if(htmlCharCount>0)
 									o.write(METHOD_SUFFIX);
 								htmlCharCount = 0;
-								break;
-							case '<':
+							}
+							case '<' -> {
 								if((htmlCharCount++)==0)
 									o.write(prefixStatic);
 								o.write(cback);
 								o.flushBuffer();
-								break;
-							default:
+							}
+							default -> {
 								state = State.HTML;
 								if((htmlCharCount++)==0)
 									o.write(prefixStatic);
 								o.write(cback);
 								o.write(c);
 								o.flushBuffer();
-								break;
+							}
 						}
-						break;
-					case JAVA_FIRST:
+					}
+					case JAVA_FIRST -> {
 						switch(c)
 						{
-							case '%':
+							case '%' -> {
 								state = State.JAVA_PERCENT;
 								cback = c;
-								break;
-							case '=':
+							}
+							case '=' -> {
 								state = State.JAVA;
 								expression = true;
 								o.write(prefixExpression);
 								o.flushBuffer();
-								break;
-							default:
+							}
+							default -> {
 								state = State.JAVA;
 								o.write(c);
 								o.flushBuffer();
-								break;
+							}
 						}
-						break;
-					case JAVA:
+					}
+					case JAVA -> {
 						//noinspection SwitchStatementWithTooFewBranches
 						switch(c)
 						{
-							case '%':
+							case '%' -> {
 								state = State.JAVA_PERCENT;
 								cback = c;
-								break;
-							default:
+							}
+							default -> {
 								o.write(c);
 								o.flushBuffer();
-								break;
+							}
 						}
-						break;
-					case JAVA_PERCENT:
+					}
+					case JAVA_PERCENT -> {
 						if(c=='>')
 						{
 							state = State.HTML;
@@ -229,8 +229,8 @@ private void translate(final AtomicInteger count) throws IOException
 							o.write(c);
 							o.flushBuffer();
 						}
-						break;
-					default:
+					}
+					default ->
 						throw new RuntimeException(String.valueOf(state));
 				}
 				if ( c=='\n' ) o.incrementSourceLineCount();

diff --git a/src/com/exedio/jspm/SourceRefWriter.java b/src/com/exedio/jspm/SourceRefWriter.java
@@ -100,17 +100,16 @@ private void updateCharsInLine(final char c)
 	{
 		switch (c)
 		{
-			case '\n':
-			case '\r':
+			case '\n',
+					'\r' ->
 				charsInLine = 0;
-				break;
-			case '\t':
+
+			case '\t' -> {
 				final int charsPerTab = config.getCharsPerTab();
 				charsInLine = ((charsInLine/charsPerTab)+1)*charsPerTab;
-				break;
-			default:
+			}
+			default ->
 				charsInLine++;
-				break;
 		}
 	}