From b361e269f2ef98a0e5b3dbedded5af80b9021a36 Mon Sep 17 00:00:00 2001 From: Aleksandar Kurtakov Date: Tue, 2 Dec 2025 21:55:30 +0200 Subject: [PATCH 1/2] Remove useless null checks As found by https://github.com/eclipse-wildwebdeveloper/wildwebdeveloper/security/code-scanning --- .../xml/internal/autoclose/XMLAutoCloseTagReconciler.java | 4 ++-- .../html/autoinsert/HTMLAutoInsertReconciler.java | 4 ++-- .../wildwebdeveloper/markdown/MarkdownLanguageClient.java | 2 +- .../vue/autoinsert/VueAutoInsertReconciler.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/autoclose/XMLAutoCloseTagReconciler.java b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/autoclose/XMLAutoCloseTagReconciler.java index 1489d4dbf8..4da65a3801 100644 --- a/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/autoclose/XMLAutoCloseTagReconciler.java +++ b/org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/autoclose/XMLAutoCloseTagReconciler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022, 2023 Red Hat Inc. and others. + * Copyright (c) 2022, 2025 Red Hat Inc. and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -102,7 +102,7 @@ private void autoInsert(DocumentEvent event) { return; } IDocument document = event.getDocument(); - if (document == null || event == null || event.getLength() != 0 || event.getText().length() != 1) { + if (document == null || event.getLength() != 0 || event.getText().length() != 1) { return; } diff --git a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/html/autoinsert/HTMLAutoInsertReconciler.java b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/html/autoinsert/HTMLAutoInsertReconciler.java index 7779c58dd6..efd268e6a4 100644 --- a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/html/autoinsert/HTMLAutoInsertReconciler.java +++ b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/html/autoinsert/HTMLAutoInsertReconciler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022, 2024 Red Hat Inc. and others. + * Copyright (c) 2022, 2025 Red Hat Inc. and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -57,7 +57,7 @@ private void autoInsert(DocumentEvent event) { return; } IDocument document = event.getDocument(); - if (document == null || event == null || event.getLength() != 0 || event.getText().length() != 1) { + if (document == null || event.getLength() != 0 || event.getText().length() != 1) { return; } diff --git a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/markdown/MarkdownLanguageClient.java b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/markdown/MarkdownLanguageClient.java index e592fb75ab..bed4e837bd 100644 --- a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/markdown/MarkdownLanguageClient.java +++ b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/markdown/MarkdownLanguageClient.java @@ -459,7 +459,7 @@ public CompletableFuture fsWatcherCreate(final Map params) final var uri = params.get("uri"); if (uri == null) return null; - final var path = uri == null ? null : FileUtils.uriToPath(uri.toString()); + final var path = FileUtils.uriToPath(uri.toString()); @SuppressWarnings("unchecked") final Map options = params.get("options") instanceof Map // diff --git a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/vue/autoinsert/VueAutoInsertReconciler.java b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/vue/autoinsert/VueAutoInsertReconciler.java index 7b084ba187..9391dc061c 100644 --- a/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/vue/autoinsert/VueAutoInsertReconciler.java +++ b/org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/vue/autoinsert/VueAutoInsertReconciler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022, 2024 Red Hat Inc. and others. + * Copyright (c) 2022, 2025 Red Hat Inc. and others. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -51,7 +51,7 @@ private void autoInsert(DocumentEvent event) { return; } IDocument document = event.getDocument(); - if (document == null || event == null || event.getLength() != 0) { + if (document == null || event.getLength() != 0) { return; } From 2e4f55816e447471cc353143b4fa3d0a6ac15f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 2 Dec 2025 22:00:32 +0200 Subject: [PATCH 2/2] Version bumps for new stream --- org.eclipse.wildwebdeveloper.xml.feature/feature.xml | 2 +- org.eclipse.wildwebdeveloper.xml.feature/pom.xml | 2 +- org.eclipse.wildwebdeveloper.xml/META-INF/MANIFEST.MF | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.wildwebdeveloper.xml.feature/feature.xml b/org.eclipse.wildwebdeveloper.xml.feature/feature.xml index 1301ccfde7..2d73883adb 100644 --- a/org.eclipse.wildwebdeveloper.xml.feature/feature.xml +++ b/org.eclipse.wildwebdeveloper.xml.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.wildwebdeveloper.xml.feature/pom.xml b/org.eclipse.wildwebdeveloper.xml.feature/pom.xml index f07f7b75e4..3ff7725827 100644 --- a/org.eclipse.wildwebdeveloper.xml.feature/pom.xml +++ b/org.eclipse.wildwebdeveloper.xml.feature/pom.xml @@ -7,5 +7,5 @@ 1.0.0-SNAPSHOT eclipse-feature - 1.3.8-SNAPSHOT + 1.3.9-SNAPSHOT diff --git a/org.eclipse.wildwebdeveloper.xml/META-INF/MANIFEST.MF b/org.eclipse.wildwebdeveloper.xml/META-INF/MANIFEST.MF index 9c9094b4f7..85fff4b194 100644 --- a/org.eclipse.wildwebdeveloper.xml/META-INF/MANIFEST.MF +++ b/org.eclipse.wildwebdeveloper.xml/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.wildwebdeveloper.xml;singleton:=true -Bundle-Version: 1.3.8.qualifier +Bundle-Version: 1.3.9.qualifier Bundle-License: EPL-2.0;link="http://www.eclipse.org/legal/epl-2.0" Bundle-Vendor: %providerName Bundle-Localization: plugin