Merge pull request #518 from fortran-lang:gnikit/issue517

Gnikit/issue517

Author: gnikit

CHANGELOG.md

@@ -77,6 +77,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+- Fixed formatter output mixes stdout and stderr
+  ([#517](https://github.com/fortran-lang/vscode-fortran-support/issues/517))
 - Fixed `error stop variable` syntax highlighting
   ([#486](https://github.com/fortran-lang/vscode-fortran-support/issues/486))
 - Fixed issue with linter cache containing outdated folders

src/features/formatting-provider.ts

@@ -64,8 +64,9 @@ export class FortranFormattingProvider implements vscode.DocumentFormattingEditP
 
     const args: string[] = ['--stdout', ...this.getFormatterArgs()];
     const edits: vscode.TextEdit[] = [];
-    const output = await spawnAsPromise(formatter, args, undefined, document.getText());
-    edits.push(new vscode.TextEdit(getWholeFileRange(document), output));
+    const [stdout, stderr] = await spawnAsPromise(formatter, args, undefined, document.getText());
+    edits.push(new vscode.TextEdit(getWholeFileRange(document), stdout));
+    if (stderr) this.logger.logInfo(`fprettify error output: ${stderr}`);
     return edits;
   }
 
@@ -88,8 +89,9 @@ export class FortranFormattingProvider implements vscode.DocumentFormattingEditP
 
     const args: string[] = this.getFormatterArgs();
     const edits: vscode.TextEdit[] = [];
-    const output = await spawnAsPromise(formatter, args, undefined, document.getText());
-    edits.push(new vscode.TextEdit(getWholeFileRange(document), output));
+    const [stdout, stderr] = await spawnAsPromise(formatter, args, undefined, document.getText());
+    edits.push(new vscode.TextEdit(getWholeFileRange(document), stdout));
+    if (stderr) this.logger.logInfo(`findent error output: ${stderr}`);
     return edits;
   }
 

src/lib/tools.ts

@@ -264,18 +264,18 @@ export async function spawnAsPromise(
   options: cp.SpawnOptions | undefined,
   input: string | undefined
 ) {
-  return new Promise<string>((resolve, reject) => {
-    // You could separate STDOUT and STDERR if your heart so desires...
-    let output = '';
+  return new Promise<[string, string]>((resolve, reject) => {
+    let stdout = '';
+    let stderr = '';
     const child = cp.spawn(cmd, args, options);
     child.stdout.on('data', data => {
-      output += data;
+      stdout += data;
     });
     child.stderr.on('data', data => {
-      output += data;
+      stderr += data;
     });
     child.on('close', code => {
-      code === 0 ? resolve(output) : reject(output);
+      code === 0 ? resolve([stdout, stderr]) : reject([stdout, stderr]);
     });
     child.on('error', err => {
       reject(err.toString());

test/formatting-provider.test.ts

@@ -55,6 +55,22 @@ end program main
    end do
    end do
 end program main
+`;
+    strictEqual(edits[0].newText.toString(), ref);
+  });
+
+  test(`Using fprettify with stderr`, async () => {
+    doc = await vscode.workspace.openTextDocument(
+      vscode.Uri.file(
+        path.resolve(__dirname, '../../test/resources/formatting_test_fprettify_long_lines.f90')
+      )
+    );
+    const edits = await fmt['doFormatFprettify'](doc);
+    const ref = `program demo
+
+    write(*, "('Just a very long line. Just a very long line. Just a very long line. Just a very long line. Just a very long line. Just a very long line. ',i0)") 100
+
+end program
 `;
     strictEqual(edits[0].newText.toString(), ref);
   });

test/resources/formatting_test_fprettify_long_lines.f90

@@ -0,0 +1,6 @@
+program demo
+
+    write(*, "('Just a very long line. Just a very long line. Just a very long line. Just a very long line. Just a very long line. Just a very long line. ',i0)") 100
+ 
+endprogram
+ 

test/resources/formatting_test_fprettify_long_lines.f90.snap

@@ -0,0 +1,21 @@
+>program demo
+#^^^^^^^ source.fortran.free meta.program.fortran keyword.control.program.fortran
+#       ^ source.fortran.free meta.program.fortran
+#        ^^^^ source.fortran.free meta.program.fortran entity.name.program.fortran
+>
+>    write(*, "('Just a very long line. Just a very long line. Just a very long line. Just a very long line. Just a very long line. Just a very long line. ',i0)") 100
+#^^^^ source.fortran.free meta.program.fortran meta.block.specification.program.fortran
+#    ^^^^^ source.fortran.free meta.program.fortran meta.block.specification.program.fortran meta.statement.IO.fortran keyword.control.write.fortran
+#         ^ source.fortran.free meta.program.fortran meta.block.specification.program.fortran meta.statement.IO.fortran punctuation.parentheses.left.fortran
+#          ^ source.fortran.free meta.program.fortran meta.block.specification.program.fortran meta.statement.IO.fortran keyword.operator.power.fortran
+#           ^^ source.fortran.free meta.program.fortran meta.block.specification.program.fortran meta.statement.IO.fortran
+#             ^ source.fortran.free meta.program.fortran meta.block.specification.program.fortran meta.statement.IO.fortran string.quoted.double.fortran punctuation.definition.string.begin.fortran
+#              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.fortran.free meta.program.fortran meta.block.specification.program.fortran meta.statement.IO.fortran string.quoted.double.fortran
+#                                                                                                                                                               ^ source.fortran.free meta.program.fortran meta.block.specification.program.fortran meta.statement.IO.fortran string.quoted.double.fortran punctuation.definition.string.end.fortran
+#                                                                                                                                                                ^ source.fortran.free meta.program.fortran meta.block.specification.program.fortran meta.statement.IO.fortran punctuation.parentheses.right.fortran
+#                                                                                                                                                                 ^ source.fortran.free meta.program.fortran meta.block.specification.program.fortran meta.statement.IO.fortran meta.name-list.fortran
+#                                                                                                                                                                  ^^^ source.fortran.free meta.program.fortran meta.block.specification.program.fortran meta.statement.IO.fortran meta.name-list.fortran constant.numeric.fortran
+> 
+>endprogram
+#^^^^^^^^^^ source.fortran.free meta.program.fortran keyword.control.endprogram.fortran
+>