diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogic.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogic.java
index 53640118526..da272de0976 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogic.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogic.java
@@ -78,18 +78,16 @@ public void activate(SearchOptions searchOption) {
 		}
 
 		switch (searchOption) {
-		case GLOBAL:
-			unsetSearchScope();
-			break;
-		case FORWARD:
-		case INCREMENTAL:
-			if (shouldInitIncrementalBaseLocation()) {
-				resetIncrementalBaseLocation();
+			case GLOBAL -> unsetSearchScope();
+			case FORWARD, INCREMENTAL -> {
+				if (shouldInitIncrementalBaseLocation()) {
+					resetIncrementalBaseLocation();
+				}
+			}
+			// $CASES-OMITTED$
+			default -> {
+				// No action needed; keeping an explicit default for clarity
 			}
-			break;
-		// $CASES-OMITTED$
-		default:
-			break;
 		}
 	}
 
@@ -131,19 +129,12 @@ private void resetStatus() {
 
 	@Override
 	public boolean isAvailable(SearchOptions searchOption) {
-		switch (searchOption) {
-		case REGEX:
-			return isTargetSupportingRegEx;
-		case WHOLE_WORD:
-			return !isAvailableAndActive(SearchOptions.REGEX) && isWord(findString);
-		case INCREMENTAL:
-		case CASE_SENSITIVE:
-		case FORWARD:
-		case GLOBAL:
-		case WRAP:
-		default:
-			return true;
-		}
+		return switch (searchOption) {
+			case REGEX -> isTargetSupportingRegEx;
+			case WHOLE_WORD -> !isAvailableAndActive(SearchOptions.REGEX) && isWord(findString);
+			case INCREMENTAL, CASE_SENSITIVE, FORWARD, GLOBAL, WRAP -> true;
+			default -> true;
+		};
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogicMessageGenerator.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogicMessageGenerator.java
index 6100a8ec568..35312933d5b 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogicMessageGenerator.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/FindReplaceLogicMessageGenerator.java
@@ -41,22 +41,12 @@ public String visit(ReplaceAllStatus status) {
 	@Override
 	public String visit(FindStatus status) {
 		FindStatus.StatusCode messageCode = status.getMessageCode();
-		String message;
-		switch (messageCode) {
-		case NO_MATCH:
-			message = FindReplaceMessages.FindReplace_Status_noMatch_label;
-			break;
-		case WRAPPED:
-			message = FindReplaceMessages.FindReplace_Status_wrapped_label;
-			break;
-		case READONLY:
-			message = FindReplaceMessages.FindReplaceDialog_read_only;
-			break;
-		default:
-			message = ""; //$NON-NLS-1$
-		}
-
-		return message;
+		return switch (messageCode) {
+			case NO_MATCH -> FindReplaceMessages.FindReplace_Status_noMatch_label;
+			case WRAPPED -> FindReplaceMessages.FindReplace_Status_wrapped_label;
+			case READONLY -> FindReplaceMessages.FindReplaceDialog_read_only;
+			default -> ""; //$NON-NLS-1$
+		};
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java
index aa728bf0626..c087a932237 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/findandreplace/overlay/FindReplaceOverlay.java
@@ -232,49 +232,53 @@ private class CustomFocusOrder {
 
 		private final Listener replaceBarToSearchBarAndTools = e -> {
 			switch (e.detail) {
-			case SWT.TRAVERSE_TAB_NEXT:
-				e.doit = false;
-				searchBar.getDropDownTool().getFirstControl().forceFocus();
-				break;
-			case SWT.TRAVERSE_TAB_PREVIOUS:
-				e.doit = false;
-				searchBar.getTextBar().forceFocus();
-				break;
-			default:
-				// Proceed as normal
+				case SWT.TRAVERSE_TAB_NEXT -> {
+					e.doit = false;
+					searchBar.getDropDownTool().getFirstControl().forceFocus();
+				}
+				case SWT.TRAVERSE_TAB_PREVIOUS -> {
+					e.doit = false;
+					searchBar.getTextBar().forceFocus();
+				}
+				default -> {
+					// Proceed as normal
+				}
 			}
 		};
 
 		private final Listener searchToolsToReplaceBar = e -> {
 			switch (e.detail) {
-			case SWT.TRAVERSE_TAB_PREVIOUS:
-				e.doit = false;
-				replaceBar.forceFocus();
-				break;
-			default:
-				// Proceed as normal
+				case SWT.TRAVERSE_TAB_PREVIOUS -> {
+					e.doit = false;
+					replaceBar.forceFocus();
+				}
+				default -> {
+					// Proceed as normal
+				}
 			}
 		};
 
 		private final Listener closeToolsToReplaceTools = e -> {
 			switch (e.detail) {
-			case SWT.TRAVERSE_TAB_NEXT:
-				e.doit = false;
-				replaceBar.getDropDownTool().getFirstControl().forceFocus();
-				break;
-			default:
-				// Proceed as normal
+				case SWT.TRAVERSE_TAB_NEXT -> {
+					e.doit = false;
+					replaceBar.getDropDownTool().getFirstControl().forceFocus();
+				}
+				default -> {
+					// Proceed as normal
+				}
 			}
 		};
 
 		private final Listener replaceToolsToCloseTools = e -> {
 			switch (e.detail) {
-			case SWT.TRAVERSE_TAB_PREVIOUS:
-				e.doit = false;
-				closeTools.getFirstControl().forceFocus();
-				break;
-			default:
-				// Proceed as normal
+				case SWT.TRAVERSE_TAB_PREVIOUS -> {
+					e.doit = false;
+					closeTools.getFirstControl().forceFocus();
+				}
+				default -> {
+					// Proceed as normal
+				}
 			}
 		};
 
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DiffRegion.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DiffRegion.java
index be21d4d2b2b..62cee5161e3 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DiffRegion.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/internal/texteditor/quickdiff/DiffRegion.java
@@ -62,22 +62,20 @@ public DiffRegion(QuickDiffRangeDifference difference, int offset, List<QuickDif
 	public String getType() {
 		// we return unknown for unchanged regions to avoid
 		// them getting displayed.
-		switch (getChangeType()) {
-			case CHANGED:
+		return switch (getChangeType()) {
+			case CHANGED -> {
 				int r= fDifference.rightLength();
 				int l= fDifference.leftLength();
 				int c= Math.min(r, l);
 				if (c == 0 && r - l < 0)
-					return "org.eclipse.ui.workbench.texteditor.quickdiffDeletion"; //$NON-NLS-1$
+					yield "org.eclipse.ui.workbench.texteditor.quickdiffDeletion"; //$NON-NLS-1$
 				else
-					return "org.eclipse.ui.workbench.texteditor.quickdiffChange"; //$NON-NLS-1$
-			case ADDED:
-				return "org.eclipse.ui.workbench.texteditor.quickdiffAddition"; //$NON-NLS-1$
-			case UNCHANGED:
-				return "org.eclipse.ui.workbench.texteditor.quickdiffUnchanged"; //$NON-NLS-1$
-			default:
-				return TYPE_UNKNOWN;
-		}
+					yield "org.eclipse.ui.workbench.texteditor.quickdiffChange"; //$NON-NLS-1$
+			}
+			case ADDED -> "org.eclipse.ui.workbench.texteditor.quickdiffAddition"; //$NON-NLS-1$
+			case UNCHANGED -> "org.eclipse.ui.workbench.texteditor.quickdiffUnchanged"; //$NON-NLS-1$
+			default -> TYPE_UNKNOWN;
+		};
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
index cd796b8595d..67be085e66c 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
@@ -4041,19 +4041,16 @@ protected void installCodeMiningProviders() {
 	 * @since 3.4
 	 */
 	private EnrichMode convertEnrichModePreference(int mode) {
-		switch (mode) {
-			case -1:
-				return null;
-			case 0:
-				return EnrichMode.AFTER_DELAY;
-			case 1:
-				return EnrichMode.IMMEDIATELY;
-			case 2:
-				return EnrichMode.ON_CLICK;
-			default:
+		return switch (mode) {
+			case -1 -> null;
+			case 0 -> EnrichMode.AFTER_DELAY;
+			case 1 -> EnrichMode.IMMEDIATELY;
+			case 2 -> EnrichMode.ON_CLICK;
+			default -> {
 				Assert.isLegal(false);
-			return null;
-		}
+				yield null;
+			}
+		};
 	}
 
 	/**
@@ -4537,25 +4534,22 @@ protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
 
 		if (property != null) {
 			switch (property) {
-			case PREFERENCE_COLOR_FOREGROUND:
-			case PREFERENCE_COLOR_FOREGROUND_SYSTEM_DEFAULT:
-			case PREFERENCE_COLOR_BACKGROUND:
-			case PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT:
-			case PREFERENCE_COLOR_SELECTION_FOREGROUND:
-			case PREFERENCE_COLOR_SELECTION_FOREGROUND_SYSTEM_DEFAULT:
-			case PREFERENCE_COLOR_SELECTION_BACKGROUND:
-			case PREFERENCE_COLOR_SELECTION_BACKGROUND_SYSTEM_DEFAULT:
-				initializeViewerColors(fSourceViewer);
-				break;
-			case PREFERENCE_COLOR_FIND_SCOPE:
-				initializeFindScopeColor(fSourceViewer);
-				break;
-			case PREFERENCE_USE_CUSTOM_CARETS:
-			case PREFERENCE_WIDE_CARET:
-				updateCaret();
-				break;
-			default:
-				break;
+				case PREFERENCE_COLOR_FOREGROUND,
+					 PREFERENCE_COLOR_FOREGROUND_SYSTEM_DEFAULT,
+					 PREFERENCE_COLOR_BACKGROUND,
+					 PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT,
+					 PREFERENCE_COLOR_SELECTION_FOREGROUND,
+					 PREFERENCE_COLOR_SELECTION_FOREGROUND_SYSTEM_DEFAULT,
+					 PREFERENCE_COLOR_SELECTION_BACKGROUND,
+					 PREFERENCE_COLOR_SELECTION_BACKGROUND_SYSTEM_DEFAULT ->
+					initializeViewerColors(fSourceViewer);
+				case PREFERENCE_COLOR_FIND_SCOPE -> initializeFindScopeColor(fSourceViewer);
+				case PREFERENCE_USE_CUSTOM_CARETS,
+					 PREFERENCE_WIDE_CARET ->
+					updateCaret();
+				default -> {
+					// No action needed
+				}
 			}
 		}
 
@@ -6692,29 +6686,24 @@ protected void updateStatusField(String category) {
 
 		IStatusField field= getStatusField(category);
 		if (field != null) {
-
-			String text= null;
-
-			switch (category) {
-			case ITextEditorActionConstants.STATUS_CATEGORY_INPUT_POSITION:
-				text= getCursorPosition();
-				break;
-			case ITextEditorActionConstants.STATUS_CATEGORY_ELEMENT_STATE:
-				text= isEditorInputReadOnly() ? fReadOnlyLabel : fWritableLabel;
-				break;
-			case ITextEditorActionConstants.STATUS_CATEGORY_INPUT_MODE:
-				InsertMode mode= getInsertMode();
-				if (fIsOverwriting)
-					text= fOverwriteModeLabel;
-				else if (INSERT == mode)
-					text= fInsertModeLabel;
-				else if (SMART_INSERT == mode)
-					text= fSmartInsertModeLabel;
-				break;
-			default:
-				break;
-			}
-
+			String text = switch (category) {
+				case ITextEditorActionConstants.STATUS_CATEGORY_INPUT_POSITION ->
+				    getCursorPosition();
+				case ITextEditorActionConstants.STATUS_CATEGORY_ELEMENT_STATE ->
+					isEditorInputReadOnly() ? fReadOnlyLabel : fWritableLabel;
+				case ITextEditorActionConstants.STATUS_CATEGORY_INPUT_MODE -> {
+					InsertMode mode = getInsertMode();
+					if (fIsOverwriting)
+						yield fOverwriteModeLabel;
+					else if (INSERT == mode)
+						yield fInsertModeLabel;
+					else if (SMART_INSERT == mode)
+						yield fSmartInsertModeLabel;
+					else
+						yield null;
+				}
+				default -> null;
+			};
 			field.setText(text == null ? fErrorLabel : text);
 		}
 	}
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DeleteLineAction.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DeleteLineAction.java
index 3c2d30cf816..b67879187e7 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DeleteLineAction.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DeleteLineAction.java
@@ -118,17 +118,15 @@ public DeleteLineAction(ITextEditor editor, int type, boolean copyToClipboard) {
 	 * @since 3.5
 	 */
 	private static String getPrefix(int type, boolean copyToClipboard) {
-		switch (type) {
-			case WHOLE:
-				return copyToClipboard ? "Editor.CutLine." : "Editor.DeleteLine."; //$NON-NLS-1$ //$NON-NLS-2$
-			case TO_BEGINNING:
-				return copyToClipboard ? "Editor.CutLineToBeginning." : "Editor.DeleteLineToBeginning."; //$NON-NLS-1$ //$NON-NLS-2$
-			case TO_END:
-				return copyToClipboard ? "Editor.CutLineToEnd." : "Editor.DeleteLineToEnd."; //$NON-NLS-1$ //$NON-NLS-2$
-			default:
+		return switch (type) {
+			case WHOLE -> copyToClipboard ? "Editor.CutLine." : "Editor.DeleteLine."; //$NON-NLS-1$ //$NON-NLS-2$
+			case TO_BEGINNING -> copyToClipboard ? "Editor.CutLineToBeginning." : "Editor.DeleteLineToBeginning."; //$NON-NLS-1$ //$NON-NLS-2$
+			case TO_END -> copyToClipboard ? "Editor.CutLineToEnd." : "Editor.DeleteLineToEnd."; //$NON-NLS-1$ //$NON-NLS-2$
+			default -> {
 				Assert.isLegal(false);
-				return ""; //$NON-NLS-1$
-		}
+				yield ""; //$NON-NLS-1$
+			}
+		};
 	}
 
 	/**
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java
index 31d0b6c78d9..85890dd9e09 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/IncrementalFindTarget.java
@@ -434,64 +434,46 @@ public void verifyKey(VerifyEvent event) {
 
 		fSearching= true;
 		if (event.character == 0) {
-
 			switch (event.keyCode) {
-
-			// ALT, CTRL, ARROW_LEFT, ARROW_RIGHT == leave
-			case SWT.ARROW_LEFT:
-			case SWT.ARROW_RIGHT:
-			case SWT.HOME:
-			case SWT.END:
-			case SWT.PAGE_DOWN:
-			case SWT.PAGE_UP:
-				leave();
-				break;
-
-			case SWT.ARROW_DOWN:
-				saveState();
-				setDirection(true);
-				repeatSearch(fForward);
-				event.doit= false;
-				break;
-
-			case SWT.ARROW_UP:
-				saveState();
-				setDirection(false);
-				repeatSearch(fForward);
-				event.doit= false;
-				break;
+				// ALT, CTRL, ARROW_LEFT, ARROW_RIGHT == leave
+				case SWT.ARROW_LEFT, SWT.ARROW_RIGHT, SWT.HOME, SWT.END, SWT.PAGE_DOWN, SWT.PAGE_UP -> leave();
+				case SWT.ARROW_DOWN -> {
+					saveState();
+					setDirection(true);
+					repeatSearch(fForward);
+					event.doit = false;
+				}
+				case SWT.ARROW_UP -> {
+					saveState();
+					setDirection(false);
+					repeatSearch(fForward);
+					event.doit = false;
+				}
 			}
-
 		// event.character != 0
 		} else {
-
 			switch (event.character) {
-
-			// ESC, CR = quit
-			case 0x1B:
-			case 0x0D:
-				leave();
-				event.doit= false;
-				break;
-
-			// backspace	and delete
-			case 0x08:
-			case 0x7F:
-				restoreState();
-				event.doit= false;
-				break;
-
-			default:
-				int stateMask= event.stateMask;
-				if (stateMask == 0
-						|| stateMask == SWT.SHIFT
-						|| !Util.isMac() && stateMask == (SWT.ALT | SWT.CTRL) // AltGr (see bug 43049)
-						|| Util.isMac() && (stateMask == (SWT.ALT | SWT.SHIFT) || stateMask == SWT.ALT) ) { // special chars on Mac (bug 272994)
-					saveState();
-					addCharSearch(event.character);
-					event.doit= false;
+				// ESC, CR = quit
+				case 0x1B, 0x0D -> {
+					leave();
+					event.doit = false;
+				}
+				// backspace	and delete
+				case 0x08, 0x7F -> {
+					restoreState();
+					event.doit = false;
+				}
+				default -> {
+					int stateMask = event.stateMask;
+					if (stateMask == 0
+							|| stateMask == SWT.SHIFT
+							|| !Util.isMac() && stateMask == (SWT.ALT | SWT.CTRL) // AltGr (see bug 43049)
+							|| Util.isMac() && (stateMask == (SWT.ALT | SWT.SHIFT) || stateMask == SWT.ALT) ) { // special chars on Mac (bug 272994)
+						saveState();
+						addCharSearch(event.character);
+						event.doit = false;
+					}
 				}
-				break;
 			}
 		}
 		updateStatus();
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MarkAction.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MarkAction.java
index 4411910486d..b1be54b49be 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MarkAction.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/MarkAction.java
@@ -65,17 +65,9 @@ public void run() {
 			return;
 
 		switch (fType) {
-		case SET_MARK:
-			target.setMarkAtCursor(true);
-			break;
-
-		case CLEAR_MARK:
-			target.setMarkAtCursor(false);
-			break;
-
-		case SWAP_MARK:
-			target.swapMarkAndCursor();
-			break;
+			case SET_MARK -> target.setMarkAtCursor(true);
+			case CLEAR_MARK -> target.setMarkAtCursor(false);
+			case SWAP_MARK -> target.swapMarkAndCursor();
 		}
 	}
 }
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RecenterAction.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RecenterAction.java
index c5f849fd39a..0e6f5e3b840 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RecenterAction.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/RecenterAction.java
@@ -80,20 +80,12 @@ public void run() {
 		}
 		fPrevOffset= caretOffset;
 
-		int line= 0;
-		switch (fDestPos) {
-			case RECENTER_MIDDLE:
-				line= Math.max(0, (caretLine - rowsPerScreen / 2));
-				break;
-			case RECENTER_TOP:
-				line= caretLine;
-				break;
-			case RECENTER_BOTTOM:
-				line= Math.max(0, caretLine - rowsPerScreen + 1);
-				break;
-			default:
-				break;
-		}
+		int line = switch (fDestPos) {
+			case RECENTER_MIDDLE -> Math.max(0, (caretLine - rowsPerScreen / 2));
+			case RECENTER_TOP -> caretLine;
+			case RECENTER_BOTTOM -> Math.max(0, caretLine - rowsPerScreen + 1);
+			default -> 0;
+		};
 		st.setTopIndex(line);
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextViewerDeleteLineTarget.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextViewerDeleteLineTarget.java
index c3f6bc0b0c7..132d0f6614d 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextViewerDeleteLineTarget.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/TextViewerDeleteLineTarget.java
@@ -265,46 +265,39 @@ private IRegion getDeleteRegion(IDocument document, ITextSelection selection, in
 		int resultOffset= 0;
 		int resultLength= 0;
 
-		switch  (type) {
-			case DeleteLineAction.WHOLE:
-				resultOffset= document.getLineOffset(line);
-				int endLine= selection.getEndLine();
-				resultLength= document.getLineOffset(endLine) + document.getLineLength(endLine) - resultOffset;
+		switch (type) {
+			case DeleteLineAction.WHOLE -> {
+				resultOffset = document.getLineOffset(line);
+				int endLine = selection.getEndLine();
+				resultLength = document.getLineOffset(endLine) + document.getLineLength(endLine) - resultOffset;
 				if (resultLength == 0 && line > 0) {
 					// Selection is on the last empty line of the editor. Delete
 					// delimiter of the previous line to effectively remove it.
-					String previousLineDelimiter= document.getLineDelimiter(line - 1);
+					String previousLineDelimiter = document.getLineDelimiter(line - 1);
 					if (previousLineDelimiter != null) {
-						resultOffset-= previousLineDelimiter.length();
-						resultLength= previousLineDelimiter.length();
+						resultOffset -= previousLineDelimiter.length();
+						resultLength = previousLineDelimiter.length();
 					}
 				}
-				break;
-
-		case DeleteLineAction.TO_BEGINNING:
-			resultOffset= document.getLineOffset(line);
-			resultLength= offset - resultOffset;
-			break;
-
-		case DeleteLineAction.TO_END:
-			resultOffset= offset;
-
-			IRegion lineRegion= document.getLineInformation(line);
-			int end= lineRegion.getOffset() + lineRegion.getLength();
-
-			if (offset == end) {
-				String lineDelimiter= document.getLineDelimiter(line);
-				resultLength= lineDelimiter == null ? 0 : lineDelimiter.length();
-
-			} else {
-				resultLength= end - resultOffset;
 			}
-			break;
-
-		default:
-			throw new IllegalArgumentException();
+			case DeleteLineAction.TO_BEGINNING -> {
+				resultOffset = document.getLineOffset(line);
+				resultLength = offset - resultOffset;
+			}
+			case DeleteLineAction.TO_END -> {
+				resultOffset = offset;
+				IRegion lineRegion = document.getLineInformation(line);
+				int end = lineRegion.getOffset() + lineRegion.getLength();
+
+				if (offset == end) {
+					String lineDelimiter = document.getLineDelimiter(line);
+					resultLength = lineDelimiter == null ? 0 : lineDelimiter.length();
+				} else {
+					resultLength = end - resultOffset;
+				}
+			}
+			default -> throw new IllegalArgumentException();
 		}
-
 		return clipToVisibleRegion(resultOffset, resultOffset + resultLength);
 	}
 
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java
index 246983ef04a..0180003190a 100755
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java
@@ -136,18 +136,14 @@ public final class RulerColumnDescriptor {
 		}
 
 		IConfigurationElement[] placements= element.getChildren(PLACEMENT);
-		switch (placements.length) {
-			case 0:
-				fRulerColumnPlacement= new RulerColumnPlacement();
-				break;
-			case 1:
-				fRulerColumnPlacement= new RulerColumnPlacement(placements[0]);
-				break;
-			default:
+		fRulerColumnPlacement = switch (placements.length) {
+			case 0 -> new RulerColumnPlacement();
+			case 1 -> new RulerColumnPlacement(placements[0]);
+			default -> {
 				helper.fail(RulerColumnMessages.RulerColumnDescriptor_invalid_placement_msg);
-				fRulerColumnPlacement= null; // dummy
-				break;
-		}
+				yield null; // dummy
+			}
+		};
 
 		Assert.isTrue(fTarget != null);
 		Assert.isTrue(fRulerColumnPlacement != null);
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java
index cf16109246e..e6ebf6a599c 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/AbstractTemplatesPage.java
@@ -309,23 +309,18 @@ public String getColumnText(Object element, int columnIndex) {
 		}
 
 		private String getTemplateColumnText(TemplatePersistenceData data, int columnIndex) {
-			switch (columnIndex) {
-			case 0:
-				return data.getTemplate().getName();
-			case 1:
-				return data.getTemplate().getDescription();
-			default:
-				return ""; //$NON-NLS-1$
-			}
+			return switch (columnIndex) {
+				case 0 -> data.getTemplate().getName();
+				case 1 -> data.getTemplate().getDescription();
+				default -> ""; //$NON-NLS-1$
+			};
 		}
 
 		private String getContextColumnText(TemplateContextType contextType, int columnIndex) {
-			switch (columnIndex) {
-			case 0:
-				return contextType.getName();
-			default:
-				return ""; //$NON-NLS-1$
-			}
+			return switch (columnIndex) {
+				case 0 -> contextType.getName();
+				default-> ""; //$NON-NLS-1$
+			};
 		}
 	}
 
diff --git a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java
index 0d57da728dc..e1f5c603bf7 100644
--- a/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java
+++ b/bundles/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java
@@ -691,21 +691,18 @@ public String getColumnText(Object element, int columnIndex) {
 			TemplatePersistenceData data = (TemplatePersistenceData) element;
 			Template template= data.getTemplate();
 
-			switch (columnIndex) {
-				case 0:
-					return template.getName();
-				case 1:
-					TemplateContextType type= fContextTypeRegistry.getContextType(template.getContextTypeId());
+			return switch (columnIndex) {
+				case 0 -> template.getName();
+				case 1 -> {
+					TemplateContextType type = fContextTypeRegistry.getContextType(template.getContextTypeId());
 					if (type != null)
-						return type.getName();
-					return template.getContextTypeId();
-				case 2:
-					return template.getDescription();
-				case 3:
-					return template.isAutoInsertable() ? TemplatesMessages.TemplatePreferencePage_on : "";  //$NON-NLS-1$
-				default:
-					return ""; //$NON-NLS-1$
-			}
+						yield type.getName();
+					yield template.getContextTypeId();
+				}
+				case 2 -> template.getDescription();
+				case 3 -> template.isAutoInsertable() ? TemplatesMessages.TemplatePreferencePage_on : ""; //$NON-NLS-1$
+				default -> ""; //$NON-NLS-1$
+			};
 		}
 	}