#117 Support slurping/barfing from within objects/object-types (#119)

* 🚸 Support slurping from nested objects

✅ Add slurping from nested-object tests

🏗️ Support custom subject-container-node fns

* 🚸 Support barfing from nested objects

* 🚸 Support slurping from nested object types

* 🚸 Support barfing from nested object types

* 📝 Update changelog

* 🚨 Fix linting issue

* 🩹 Handle nested-object-barfing edge cases

* 🩹 Calculate end-node-insert offset properly

Changed to calculate the end-node-text length as the difference between the last end node end index and the first end node start index - this takes into account spacing

CHANGELOG.md

@@ -2,8 +2,16 @@
 
 All notable changes to the Owlbear extension will be documented in this file.
 
+## [Unreleased]
+
+### Added
+
+- Add slurping/barfing support from within nested objects and object types
+
 ## [1.1.6] - 2024-02-23
 
+### Added
+
 - Add remote development support [#114](https://github.com/sansarip/owlbear/issues/114)
 
 ## [1.1.5] - 2023-06-04

src/cljs/owlbear/ts/edit/corpus/barf/arguments.md

@@ -73,14 +73,14 @@ foo(() => {▌},bar())
 foo(a, b,▌)
 ```
 ```typescript
-foo(a ,▌)b
+foo(a ▌)b
 ```
 
 ```typescript
 foo(a, b,,,▌)
 ```
 ```typescript
-foo(a ,,,▌)b
+foo(a ▌)b
 ```
 
 ```typescript

src/cljs/owlbear/ts/edit/corpus/barf/object_literals.md

@@ -60,3 +60,39 @@
 ```typescript
 [{▌},a ,1, 2]
 ```
+
+## In Objects
+```typescript
+{a: ▌{b: c}}
+```
+```typescript
+{a: ▌{},b: c}
+```
+
+```typescript
+{a: ▌{b: c, c: d}}
+```
+```typescript
+{a: ▌{b: c },c: d}
+```
+
+```typescript
+{a: ▌{[b]: }}
+```
+```typescript
+{a: ▌{},b }
+```
+
+```typescript
+{a: ▌{b: }}
+```
+```typescript
+{a: ▌{},b }
+```
+
+```typescript
+{a: ▌{b: c,}}
+```
+```typescript
+{a: ▌{},b: c}
+```

src/cljs/owlbear/ts/edit/corpus/barf/types.md

@@ -4,43 +4,57 @@
 type foo = {a: string;▌}
 ```
 ```typescript
-type foo = {a: ;▌}string
+type foo = {▌};a: string;
+```
+
+```typescript
+type foo = {a: string;▌};
+```
+```typescript
+type foo = {▌};a: string;
 ```
 
 ```typescript
 type foo = {a: string▌}
 ```
 ```typescript
-type foo = {a: ▌}string
+type foo = {▌};a: string;
 ```
 
 ```typescript
 interface foo {a: string;▌}
 ```
 ```typescript
-interface foo {a: ;▌}string
+interface foo {▌};a: string;
 ```
 
 ## Type/Interface with Incomplete Pair
 ```typescript
 type foo = {a:▌}
 ```
 ```typescript
-type foo = {▌}a
+type foo = {▌};a;
+```
+
+```typescript
+type foo = {a:▌};
+```
+```typescript
+type foo = {▌};a;
 ```
 
 ```typescript
 type foo = {a:▌;}
 ```
 ```typescript
-type foo = {▌}a
+type foo = {▌};a;
 ```
 
 ```typescript
 interface foo {a:▌}
 ```
 ```typescript
-interface foo {▌}a
+interface foo {▌};a;
 ```
 
 
@@ -52,4 +66,33 @@ interface bar {a: string}▌};
 ```ts
 declare namespace Foo {
 ▌}interface bar {a: string};
+```
+
+## Nested Object Types
+```ts
+type foo = {a: ▌{b: string; c: string;};}
+```
+```ts
+type foo = {a: ▌{b: string; };c: string;}
+```
+
+```ts
+type foo = {a: ▌{b: string; c: string;}}
+```
+```ts
+type foo = {a: ▌{b: string; };c: string;}
+```
+
+```ts
+type foo = {a: ▌{b: string;};}
+```
+```ts
+type foo = {a: ▌{};b: string;}
+```
+
+```ts
+type foo = {a: ▌{b: string;}}
+```
+```ts
+type foo = {a: ▌{};b: string;}
 ```

src/cljs/owlbear/ts/edit/corpus/slurp/object_literals.md

@@ -126,4 +126,57 @@ b
 ```
 ```typescript
 [{[a]: b, [c▌]:}]
-```
+```
+
+## In Objects
+```typescript
+{a: ▌{}, b: c}
+```
+```typescript
+{a: ▌{ b: c}}
+```
+
+```typescript
+{a: ▌{b: c}, c: d}
+```
+```typescript
+{a: ▌{b: c, c: d}}
+```
+
+```typescript
+{a: {b: c▌}, c: d}
+```
+```typescript
+{a: {b: c, c: d▌}}
+```
+
+```typescript
+{a: ▌{b: c, c: d}, b}
+```
+```typescript
+{a: ▌{b: c, c: d, [b]:}}
+```
+
+```typescript
+{a: {b: ▌{}, c: d}}
+```
+```typescript
+{a: {b: ▌{ c: d}}}
+```
+
+```typescript
+const foo = {
+  a: {
+    ▌b: number
+  },
+  c: string
+};
+```
+```typescript
+const foo = {
+  a: {
+    ▌b: number
+  ,
+  c: string}
+};
+```

src/cljs/owlbear/ts/edit/corpus/slurp/types.md

@@ -102,3 +102,18 @@ interface bar {a: string};
 declare namespace Foo {
 interface bar {a: string}▌};
 ```
+
+## Nested Object Types
+```ts
+type foo = {a: ▌{b: string;}; c: string;}
+```
+```ts
+type foo = {a: ▌{b: string; c: string;};}
+```
+
+```ts
+type foo = {a: ▌{}; b: string;}
+```
+```ts
+type foo = {a: ▌{ b: string};}
+```