From 452a636fe83468eb6553c8e69df3b09ed90bfcf8 Mon Sep 17 00:00:00 2001
From: Junichi Yamamoto <junichi11@apache.org>
Date: Sun, 21 Jan 2024 14:10:22 +0900
Subject: [PATCH] Fix incorrect formatting after use statements #6980

- https://github.com/apache/netbeans/issues/6980
- Fix the below case
- Add unit tests

Example:

```php
<?php
namespace {
    use Vendor\Class1;
    $test = 1;
}
```

Before:

```php
<?php

namespace {

    use Vendor\Class1;

$test = 1;
}
```

After:

```php
<?php

namespace {

    use Vendor\Class1;

    $test = 1;
}
```
---
 .../php/editor/indent/TokenFormatter.java     |  8 +++++
 .../formatting/blankLines/issueGH6980_01.php  | 22 ++++++++++++
 ...issueGH6980_01.php.testGH6980_01.formatted | 24 +++++++++++++
 .../formatting/blankLines/issueGH6980_02.php  | 24 +++++++++++++
 ...issueGH6980_02.php.testGH6980_02.formatted | 26 ++++++++++++++
 .../formatting/blankLines/issueGH6980_03.php  | 25 +++++++++++++
 ...issueGH6980_03.php.testGH6980_03.formatted | 27 ++++++++++++++
 .../blankLines/issueGH6980_NSWithBlock01.php  | 24 +++++++++++++
 ...k01.php.testGH6980_NSWithBlock01.formatted | 27 ++++++++++++++
 .../blankLines/issueGH6980_NSWithBlock02.php  | 26 ++++++++++++++
 ...k02.php.testGH6980_NSWithBlock02.formatted | 30 ++++++++++++++++
 .../blankLines/issueGH6980_NSWithBlock03.php  | 27 ++++++++++++++
 ...k03.php.testGH6980_NSWithBlock03.formatted | 30 ++++++++++++++++
 .../indent/PHPFormatterBlankLinesTest.java    | 36 +++++++++++++++++++
 14 files changed, 356 insertions(+)
 create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_01.php
 create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_01.php.testGH6980_01.formatted
 create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_02.php
 create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_02.php.testGH6980_02.formatted
 create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_03.php
 create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_03.php.testGH6980_03.formatted
 create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php
 create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php.testGH6980_NSWithBlock01.formatted
 create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php
 create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php.testGH6980_NSWithBlock02.formatted
 create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php
 create mode 100644 php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php.testGH6980_NSWithBlock03.formatted

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/indent/TokenFormatter.java b/php/php.editor/src/org/netbeans/modules/php/editor/indent/TokenFormatter.java
index 269ca955ed35..ec2c6831dccf 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/indent/TokenFormatter.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/indent/TokenFormatter.java
@@ -1770,6 +1770,14 @@ && countOfNewLines(formatTokens.get(index + 1).getOldText()) > 0) {
                                         countSpaces = ws.spaces;
                                         break;
                                     case WHITESPACE_INDENT:
+                                        if (formatTokens.get(index - 1).getId() == FormatToken.Kind.WHITESPACE_AFTER_USE) {
+                                            // GH-6980
+                                            // namespace {
+                                            //     use Vendor\Package\ExampleClass;
+                                            //     $variable = 1; // add indent spaces here
+                                            // }
+                                            countSpaces = indent;
+                                        }
                                         indentLine = true;
                                         break;
                                     case INDENT:
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_01.php b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_01.php
new file mode 100644
index 000000000000..a79bc5dd6a9b
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_01.php
@@ -0,0 +1,22 @@
+<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+    use Vendor\Package\Example;
+
+    $test = 1;
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_01.php.testGH6980_01.formatted b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_01.php.testGH6980_01.formatted
new file mode 100644
index 000000000000..7f7ee6a610e1
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_01.php.testGH6980_01.formatted
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+use Vendor\Package\Example;
+
+$test = 1;
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_02.php b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_02.php
new file mode 100644
index 000000000000..df16c571a5f2
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_02.php
@@ -0,0 +1,24 @@
+<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+    use Vendor\Package\Example;
+
+    class Example {
+        
+    }
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_02.php.testGH6980_02.formatted b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_02.php.testGH6980_02.formatted
new file mode 100644
index 000000000000..e63194f4ee1b
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_02.php.testGH6980_02.formatted
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+use Vendor\Package\Example;
+
+class Example {
+    
+}
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_03.php b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_03.php
new file mode 100644
index 000000000000..249c1d536932
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_03.php
@@ -0,0 +1,25 @@
+<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+    use Vendor\Package\ {
+        Example1,
+        Example2,
+    };
+
+    $test = 1;
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_03.php.testGH6980_03.formatted b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_03.php.testGH6980_03.formatted
new file mode 100644
index 000000000000..0919b537b0ba
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_03.php.testGH6980_03.formatted
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+use Vendor\Package\{
+    Example1,
+    Example2,
+};
+
+$test = 1;
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php
new file mode 100644
index 000000000000..f8fa60507373
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php
@@ -0,0 +1,24 @@
+<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+namespace {
+    use Vendor\Package\Example;
+
+$test = 1;
+}
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php.testGH6980_NSWithBlock01.formatted b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php.testGH6980_NSWithBlock01.formatted
new file mode 100644
index 000000000000..126f3ab44bc5
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php.testGH6980_NSWithBlock01.formatted
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+namespace {
+
+    use Vendor\Package\Example;
+
+    $test = 1;
+}
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php
new file mode 100644
index 000000000000..9340729be5ec
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php
@@ -0,0 +1,26 @@
+<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+namespace {
+    use Vendor\Package\Example;
+
+    class Example {
+        
+    }
+}
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php.testGH6980_NSWithBlock02.formatted b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php.testGH6980_NSWithBlock02.formatted
new file mode 100644
index 000000000000..d0b75508b035
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php.testGH6980_NSWithBlock02.formatted
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+namespace {
+
+    use Vendor\Package\Example;
+
+    class Example {
+        
+    }
+
+}
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php
new file mode 100644
index 000000000000..3c6fe3eadefd
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php
@@ -0,0 +1,27 @@
+<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+namespace {
+    use Vendor\Package\ {
+        Example1,
+        Example2,
+    };
+
+    $test = 1;
+}
diff --git a/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php.testGH6980_NSWithBlock03.formatted b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php.testGH6980_NSWithBlock03.formatted
new file mode 100644
index 000000000000..aaf8d11d74e9
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php.testGH6980_NSWithBlock03.formatted
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+namespace {
+
+    use Vendor\Package\{
+        Example1,
+        Example2,
+    };
+
+    $test = 1;
+}
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/indent/PHPFormatterBlankLinesTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/indent/PHPFormatterBlankLinesTest.java
index a613f2c1e279..5679ae7493e9 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/indent/PHPFormatterBlankLinesTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/indent/PHPFormatterBlankLinesTest.java
@@ -2035,4 +2035,40 @@ public void testAfterUseTraitNoBlankLine_01b() throws Exception {
         reformatFileContents("testfiles/formatting/blankLines/AfterUseTrait_01.php", options, false, true);
     }
 
+    public void testGH6980_NSWithBlock01() throws Exception {
+        HashMap<String, Object> options = new HashMap<>(FmtOptions.getDefaults());
+        options.put(FmtOptions.BLANK_LINES_AFTER_USE, 1);
+        reformatFileContents("testfiles/formatting/blankLines/issueGH6980_NSWithBlock01.php", options, false, true);
+    }
+
+    public void testGH6980_NSWithBlock02() throws Exception {
+        HashMap<String, Object> options = new HashMap<>(FmtOptions.getDefaults());
+        options.put(FmtOptions.BLANK_LINES_AFTER_USE, 1);
+        reformatFileContents("testfiles/formatting/blankLines/issueGH6980_NSWithBlock02.php", options, false, true);
+    }
+
+    public void testGH6980_NSWithBlock03() throws Exception {
+        HashMap<String, Object> options = new HashMap<>(FmtOptions.getDefaults());
+        options.put(FmtOptions.BLANK_LINES_AFTER_USE, 1);
+        reformatFileContents("testfiles/formatting/blankLines/issueGH6980_NSWithBlock03.php", options, false, true);
+    }
+
+    public void testGH6980_01() throws Exception {
+        HashMap<String, Object> options = new HashMap<>(FmtOptions.getDefaults());
+        options.put(FmtOptions.BLANK_LINES_AFTER_USE, 1);
+        reformatFileContents("testfiles/formatting/blankLines/issueGH6980_01.php", options, false, true);
+    }
+
+    public void testGH6980_02() throws Exception {
+        HashMap<String, Object> options = new HashMap<>(FmtOptions.getDefaults());
+        options.put(FmtOptions.BLANK_LINES_AFTER_USE, 1);
+        reformatFileContents("testfiles/formatting/blankLines/issueGH6980_02.php", options, false, true);
+    }
+
+    public void testGH6980_03() throws Exception {
+        HashMap<String, Object> options = new HashMap<>(FmtOptions.getDefaults());
+        options.put(FmtOptions.BLANK_LINES_AFTER_USE, 1);
+        reformatFileContents("testfiles/formatting/blankLines/issueGH6980_03.php", options, false, true);
+    }
+
 }