Update current development theme on create OR find

Now that developers can create additional development themes with the
`--development-context` flag we should make sure we're always setting
the current development theme to the one that was most recently used.

Author: graygilmore

.changeset/every-years-study.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli-kit': patch
+---
+
+Set the current theme in local development on create or find

packages/cli-kit/src/public/node/themes/theme-manager.test.ts

@@ -68,6 +68,7 @@ describe('ThemeManager', () => {
       expect(fetchTheme).toHaveBeenCalledWith(123, session)
       expect(result).toEqual(mockTheme)
       expect(themeCreate).not.toHaveBeenCalled()
+      expect(manager.getStoredThemeId()).toBe('123')
     })
 
     test('creates a new theme when one does not exist', async () => {
@@ -105,6 +106,7 @@ describe('ThemeManager', () => {
       expect(findDevelopmentThemeByName).toHaveBeenCalledWith('Dev', session)
       expect(result).toEqual(mockTheme)
       expect(themeCreate).not.toHaveBeenCalled()
+      expect(manager.getStoredThemeId()).toBe('123')
     })
   })
 

packages/cli-kit/src/public/node/themes/theme-manager.ts

@@ -15,7 +15,9 @@ export abstract class ThemeManager {
 
   async findOrCreate(name?: string, role?: Role): Promise<Theme> {
     let theme = await this.fetch(name, role)
-    if (!theme) {
+    if (theme) {
+      this.setTheme(theme.id.toString())
+    } else {
       theme = await this.create(role, name)
     }
     return theme
@@ -29,8 +31,7 @@ export abstract class ThemeManager {
     const theme =
       name && role === DEVELOPMENT_THEME_ROLE
         ? await findDevelopmentThemeByName(name, this.adminSession)
-        : // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          await fetchTheme(parseInt(this.themeId!, 10), this.adminSession)
+        : await fetchTheme(parseInt(this.themeId!, 10), this.adminSession)
 
     if (!theme) {
       this.removeTheme()