Fix unary operator after keyword (#148)

* Fix unary operator after keyword

* 0.10.1

* Bump mo-fmt

package.json

@@ -1,6 +1,6 @@
 {
     "name": "prettier-plugin-motoko",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "A code formatter for the Motoko smart contract language.",
     "main": "lib/environments/node.js",
     "browser": "lib/environments/web.js",

packages/mo-fmt/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mo-fmt",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "description": "An easy-to-use Motoko formatter command.",
     "main": "src/cli.js",
     "bin": {
@@ -22,7 +22,7 @@
         "commander": "^9.4.0",
         "fast-glob": "^3.2.11",
         "prettier": "2",
-        "prettier-plugin-motoko": "^0.10.0"
+        "prettier-plugin-motoko": "^0.10.1"
     },
     "devDependencies": {
         "@rollup/plugin-commonjs": "^28.0.1",

src/printers/motoko-tt-ast/spaceConfig.ts

@@ -98,8 +98,16 @@ const tokenEndsWith = (end: string) =>
 const tokenTypes = (types: Token['token_type'][]) =>
     token((token) => types.includes(token.token_type));
 
-const any = (conditions: ((tt: TokenTree) => boolean)[]) => (tt: TokenTree) =>
-    conditions.some((condition) => condition(tt));
+const and =
+    (...conditions: ((tt: TokenTree) => boolean)[]) =>
+    (tt: TokenTree) =>
+        conditions.every((condition) => condition(tt));
+const or =
+    (...conditions: ((tt: TokenTree) => boolean)[]) =>
+    (tt: TokenTree) =>
+        conditions.some((condition) => condition(tt));
+const not = (condition: (tt: TokenTree) => boolean) => (tt: TokenTree) =>
+    !condition(tt);
 
 // match both "block comments" and "comment groups" (lexer implementation detail)
 const blockComment = (tt: TokenTree) =>
@@ -136,8 +144,11 @@ const spaceConfig: SpaceConfig = {
         // unary operators
         [
             {
-                left: tokenTypes(['Close', 'Ident', 'Literal']),
-                main: any([tokenEquals('+'), tokenEquals('-')]),
+                left: and(
+                    tokenTypes(['Close', 'Ident', 'Literal']),
+                    not(keyword),
+                ),
+                main: or(tokenEquals('+'), tokenEquals('-')),
             },
             '_',
             'space',

tests/formatter.test.ts

@@ -569,6 +569,7 @@ public type T = {
         await expectFormatted('1 + 1\n');
         await expectFormatted('x + 1\n');
         await expectFormatted('x - +1\n');
+        await expectFormatted('return +1\n');
         expect(await format('1+1')).toEqual('1 + 1\n');
         expect(await format('1+1.0')).toEqual('1 + 1.0\n');
         expect(await format('x+1')).toEqual('x + 1\n');
@@ -585,6 +586,7 @@ public type T = {
         await expectFormatted('x + -1\n');
         await expectFormatted('x; -1\n');
         await expectFormatted('x(-1)\n');
+        await expectFormatted('return -1\n');
         expect(await format('1-1')).toEqual('1 - 1\n');
         expect(await format('1.0-1.0')).toEqual('1.0 - 1.0\n');
         expect(await format('x-1')).toEqual('x - 1\n');