Merge branch 'master' into feature/add_rule_indent_pipe_operator

Author: kokororin

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest]
-        php-version: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
+        php-version: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', '8.5']
     name: Test on ${{ matrix.os }} & PHP ${{ matrix.php-version }}
     steps:
       - name: Checkout

CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.2.52
+
+- Upgrade fmt.stub.php [(V1054.0.0)](https://github.com/driade/phpfmt8/releases/tag/v1054.0.0)
+
+### 1.2.51
+
+- Upgrade fmt.stub.php [(V1054.0.0)](https://github.com/driade/phpfmt8/releases/tag/v1054.0.0)
+
+### 1.2.50
+
+- Upgrade fmt.stub.php [(V1054.0.0)](https://github.com/driade/phpfmt8/releases/tag/v1054.0.0)
+
 ### 1.2.49
 
 - Upgrade fmt.stub.php [(V1053.0.0)](https://github.com/driade/phpfmt8/releases/tag/v1053.0.0)

README.md

@@ -181,6 +181,7 @@ transformation.
 | YodaComparisons | Execute Yoda Comparisons. |
 | SpaceAfterExclamationMark | Add space after exclamation mark. |
 | SpaceAroundParentheses | Add spaces inside parentheses. |
+| IndentPipeOperator | Applies indentation to the pipe operator. |
 <!-- Transformations END -->
 
 ## Contribute

package.json

@@ -1,7 +1,7 @@
 {
   "name": "vscode-phpfmt",
   "displayName": "phpfmt - PHP formatter",
-  "version": "1.2.49",
+  "version": "1.2.52",
   "description": "Integrates phpfmt into VS Code",
   "main": "./dist/extension",
   "scripts": {
@@ -297,6 +297,7 @@
               "YodaComparisons",
               "SpaceAfterExclamationMark",
               "SpaceAroundParentheses",
+              "IndentPipeOperator",
               "WPResizeSpaces",
               "AlignDoubleSlashComments",
               "AlignGroupDoubleArrow",
@@ -409,6 +410,7 @@
               "Execute Yoda Comparisons.",
               "Add space after exclamation mark.",
               "Add spaces inside parentheses.",
+              "Applies indentation to the pipe operator.",
               "Core pass",
               "Vertically align \"//\" comments.",
               "Vertically align T_DOUBLE_ARROW (=>) by line groups.",
@@ -530,6 +532,7 @@
               "YodaComparisons",
               "SpaceAfterExclamationMark",
               "SpaceAroundParentheses",
+              "IndentPipeOperator",
               "WPResizeSpaces",
               "AlignDoubleSlashComments",
               "AlignGroupDoubleArrow",
@@ -642,6 +645,7 @@
               "Execute Yoda Comparisons.",
               "Add space after exclamation mark.",
               "Add spaces inside parentheses.",
+              "Applies indentation to the pipe operator.",
               "Core pass",
               "Vertically align \"//\" comments.",
               "Vertically align T_DOUBLE_ARROW (=>) by line groups.",

scripts/release.mts

@@ -98,6 +98,19 @@ ${changelogData}`;
     process.exit(0);
   }
 
+  if (process.env.VSCE_TOKEN) {
+    // Publish to VSCE
+    try {
+      await $({
+        stdio: 'inherit',
+        preferLocal: true
+      })`vsce publish -p ${process.env.VSCE_TOKEN} --no-dependencies`;
+    } catch (err) {
+      consola.error(err);
+      process.exit(0);
+    }
+  }
+
   const git = simpleGit({
     config: [
       'credential.https://github.com/.helper="! f() { echo username=x-access-token; echo password=$GITHUB_TOKEN; };f"'
@@ -147,17 +160,7 @@ ${changelogData}`;
     }
   }
 
-  if (process.env.VSCE_TOKEN) {
-    // Publish to VSCE
-    try {
-      await $({
-        stdio: 'inherit',
-        preferLocal: true
-      })`vsce publish -p ${process.env.VSCE_TOKEN} --no-dependencies`;
-    } catch (err) {
-      consola.error(err);
-    }
-  }
+
 
   if (process.env.OVSX_TOKEN) {
     // Publish to OVSX

src/PHPFmt.ts

@@ -256,16 +256,24 @@ export class PHPFmt {
       throw new PHPFmtError(`Cannot create tmp file in "${tmpDir}"`);
     }
 
-    // test whether the php file has syntax error
-    try {
-      await exec(`${this.config.php_bin} -l "${tmpFileName}"`, execOptions);
-    } catch (err) {
-      this.widget.logError('PHP lint failed', err);
-      vscode.window.setStatusBarMessage(
-        'phpfmt: Format failed - syntax errors found',
-        4500
-      );
-      throw new PHPFmtSkipError();
+    const hasAutoSemicolon =
+      this.config.passes.includes('AutoSemicolon') ||
+      this.config.exclude.includes('AutoSemicolon');
+
+    if (! hasAutoSemicolon) {
+        // test whether the php file has syntax error
+        try {
+          await exec(`${this.config.php_bin} -l "${tmpFileName}"`, execOptions);
+        } catch (err) {
+          this.widget.logError('PHP lint failed', err);
+          vscode.window.setStatusBarMessage(
+            'phpfmt: Format failed - syntax errors found',
+            4500
+          );
+          throw new PHPFmtSkipError();
+        }
+    } else {
+        this.widget.logInfo('Skipping PHP lint because AutoSemicolon is active');
     }
 
     const args = this.getArgs(tmpFileName);

src/meta.ts

@@ -4,7 +4,7 @@
 // Meta info
 export const publisher = "kokororin"
 export const name = "vscode-phpfmt"
-export const version = "1.2.48"
+export const version = "1.2.51"
 export const displayName = "phpfmt - PHP formatter"
 export const description = "Integrates phpfmt into VS Code"
 export const extensionId = `${publisher}.${name}`