Fixing tests. (#17)

Co-authored-by: Jan Lahoda <[email protected]>

src/jdk.compiler/share/classes/com/sun/source/tree/MatchFailTree.java → src/jdk.compiler/share/classes/com/sun/source/tree/MatchFailedTree.java

@@ -42,5 +42,5 @@
  * @since 25
  */
 @PreviewFeature(feature= PreviewFeature.Feature.PATTERN_DECLARATIONS, reflective=true)
-public interface MatchFailTree extends StatementTree {
+public interface MatchFailedTree extends StatementTree {
 }

src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java

@@ -725,12 +725,12 @@ public enum Kind {
         MATCH(MatchTree.class), //TODO: maybe MATCH_SUCCESS
 
         /**
-         * Used for instances of {@link MatchFailTree}.
+         * Used for instances of {@link MatchFailedTree}.
          *
          * @since 25
          */
         @PreviewFeature(feature=PreviewFeature.Feature.PATTERN_DECLARATIONS, reflective=true)
-        MATCH_FAILED(MatchFailTree.class),
+        MATCH_FAILED(MatchFailedTree.class),
 
         ;
 

src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java

@@ -633,12 +633,12 @@ public interface TreeVisitor<R,P> {
     R visitMatchStatement(MatchTree node, P p);
 
     /**
-     * Visits an {@code MatchFailTree} node.
+     * Visits an {@code MatchFailedTree} node.
      * @param node the node being visited
      * @param p a parameter value
      * @return a result value
      * @since 25
      */
     @PreviewFeature(feature=PreviewFeature.Feature.PATTERN_DECLARATIONS, reflective=true)
-    R visitMatchFailStatement(MatchFailTree node, P p);
+    R visitMatchFailStatement(MatchFailedTree node, P p);
 }

src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java

@@ -1095,7 +1095,7 @@ public R visitMatchStatement(MatchTree node, P p) {
      * @return  the result of {@code defaultAction}
      */
     @Override
-    public R visitMatchFailStatement(MatchFailTree node, P p) {
+    public R visitMatchFailStatement(MatchFailedTree node, P p) {
         return defaultAction(node, p);
     }
 

src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java

@@ -1251,7 +1251,7 @@ public R visitMatchStatement(MatchTree node, P p) {
      * @return the result of scanning
      */
     @Override
-    public R visitMatchFailStatement(MatchFailTree node, P p) {
+    public R visitMatchFailStatement(MatchFailedTree node, P p) {
         return null;
     }
 

src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java

@@ -550,7 +550,7 @@ public enum Flag {
         DEPRECATED_ANNOTATION(Flags.DEPRECATED_ANNOTATION),
         DEPRECATED_REMOVAL(Flags.DEPRECATED_REMOVAL),
         HAS_RESOURCE(Flags.HAS_RESOURCE),
-        // Bit 48 is currently available
+        PARTIAL(Flags.PARTIAL),
         ANONCONSTR_BASED(Flags.ANONCONSTR_BASED),
         NAME_FILLED(Flags.NAME_FILLED),
         PREVIEW_API(Flags.PREVIEW_API),

src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java

@@ -1815,7 +1815,7 @@ public Tag getTag() {
     /**
      * The match-fail statement
      */
-    public static class JCMatchFail extends JCStatement implements MatchFailTree {
+    public static class JCMatchFail extends JCStatement implements MatchFailedTree {
 
         protected JCMatchFail() {
         }

src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java

@@ -158,7 +158,7 @@ public JCTree visitMatchStatement(MatchTree node, P p) {
     }
 
     @DefinedBy(Api.COMPILER_TREE)
-    public JCTree visitMatchFailStatement(MatchFailTree node, P p) {
+    public JCTree visitMatchFailStatement(MatchFailedTree node, P p) {
         JCMatchFail t = (JCMatchFail) node;
 
         return M.at(t.pos).MatchFail();

test/langtools/tools/javac/diags/examples/UnmarkedPartialDeconstructor.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+// key: compiler.misc.feature.pattern.declarations
+// key: compiler.warn.preview.feature.use.plural
+// key: compiler.err.unmarked.partial.deconstructor
+// options: --enable-preview -source ${jdk.version} -Xlint:preview
+
+class UnmarkedPartialDeconstructor {
+    public pattern UnmarkedPartialDeconstructor() {
+        match-fail();
+    }
+}

test/langtools/tools/javac/patterns/declarations/MatchFail.java

@@ -136,7 +136,7 @@ public case pattern Test(String content) {
             .writeAll()
             .getOutput(Task.OutputKind.STDOUT);
 
-        String expectedOut = "OK\n";
+        String expectedOut = "OK" + System.getProperty("line.separator");
 
         if (!Objects.equals(out, expectedOut)) {
             throw new AssertionError("Unexpected output, expected: " + expectedOut +