[TD] Update diagnostics test data due to new test runners

Update includes:
- Changing syntax of `OI/`NI` tags from `<!NI;TAG!>` to `<!TAG{NI}!>`
- Fix some incorrect directives
- Change order of diagnostics in some places
- Remove ignored diagnostics from FIR test data (previously `DIAGNOSTICS` didn't work)
- Update FIR dumps in some places and add `FIR_IDENTICAL` if needed
- Replace all JAVAC_SKIP with SKIP_JAVAC directive

compiler/testData/diagnostics/tests/controlStructures/kt10717.kt

@@ -1,21 +1,21 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNREACHABLE_CODE -UNUSED_PARAMETER -RETURN_NOT_ALLOWED
 
 fun <!IMPLICIT_NOTHING_RETURN_TYPE!>test1<!>() = run {
-    return <!TYPE_MISMATCH("String", "Nothing")!>"OK"<!>
+    return <!TYPE_MISMATCH("String; Nothing")!>"OK"<!>
 }
 
 fun <!IMPLICIT_NOTHING_RETURN_TYPE!>test2<!>() = run {
     fun local(): String {
         return ""
     }
-    return <!TYPE_MISMATCH("String", "Nothing")!>""<!>
+    return <!TYPE_MISMATCH("String; Nothing")!>""<!>
 }
 
 inline fun <T, R> Iterable<T>.map(transform: (T) -> R): List<R> = null!!
 fun test3(a: List<String>, b: List<Int>) = a.map {
-    if (it.length == 3) return <!TYPE_MISMATCH("Nothing?", "List<Int>")!>null<!>
-    if (it.length == 4) return <!TYPE_MISMATCH("String", "List<Int>")!>""<!>
-    if (it.length == 4) return <!TYPE_MISMATCH("Int", "List<Int>")!>5<!>
+    if (it.length == 3) return <!TYPE_MISMATCH("Nothing?; List<Int>")!>null<!>
+    if (it.length == 4) return <!TYPE_MISMATCH("String; List<Int>")!>""<!>
+    if (it.length == 4) return <!TYPE_MISMATCH("Int; List<Int>")!>5<!>
     if (it.length == 4) return b
     1
 }