@lvce-editor/server 0.10.3 → 0.10.5

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletEditorText/ViewletEditorText.ipc.js

@@ -181,7 +181,7 @@ export const Commands = {
 }
 
 // prettier-ignore
-export const events = {
+export const Events = {
   'languages.changed': ViewletEditorText.handleLanguagesChanged,
   // 'editor.change': ViewletEditorText.handleEditorChange,
   // 'tokenizer.changed': ViewletEditorText.handleTokenizeChange,

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletEditorText/ViewletEditorText.js

@@ -2,6 +2,7 @@ import * as Command from '../Command/Command.js'
 import * as Editor from '../Editor/Editor.js'
 import * as ExtensionHostSemanticTokens from '../ExtensionHost/ExtensionHostSemanticTokens.js'
 // import * as ExtensionHostTextDocument from '../ExtensionHost/ExtensionHostTextDocument.js'
+import * as EditorCommandSetLanguageId from '../EditorCommand/EditorCommandSetLanguageId.js'
 import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as GlobalEventBus from '../GlobalEventBus/GlobalEventBus.js'
 import * as Id from '../Id/Id.js'
@@ -11,7 +12,7 @@ import * as Tokenizer from '../Tokenizer/Tokenizer.js'
 import * as Viewlet from '../Viewlet/Viewlet.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 import * as Workspace from '../Workspace/Workspace.js'
-import * as EditorCommandSetLanguageId from '../EditorCommand/EditorCommandSetLanguageId.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
 const COLUMN_WIDTH = 9 // TODO compute this automatically once
 
@@ -37,7 +38,7 @@ export const handleTokenizeChange = () => {
   Viewlet.setState('EditorText', newState)
 }
 
-export const name = 'EditorText'
+export const name = ViewletModuleId.EditorText
 
 // TODO uri?
 export const create = (id, uri, left, top, width, height) => {
@@ -85,16 +86,27 @@ const getSavedDeltaY = (savedState) => {
   return 0
 }
 
+const getLanguageId = (state) => {
+  const fileName = Workspace.pathBaseName(state.uri)
+  const languageId = Languages.getLanguageId(fileName)
+  if (languageId === 'unknown') {
+    console.log('try to get language from content', state)
+    const firstLine = state.lines[0] || ''
+    const languageIdFromContent = Languages.getLanguageIdByFirstLine(firstLine)
+    return languageIdFromContent
+  }
+  return languageId
+}
+
 export const loadContent = async (state, savedState) => {
   const { uri } = state
   const rowHeight = Preferences.get('editor.lineHeight') || 20
   const fontSize = Preferences.get('editor.fontSize') || 15 // TODO find out if it is possible to use all numeric values for settings for efficiency, maybe settings could be an array
   const letterSpacing = Preferences.get('editor.letterSpacing') || 0.5
-  const fileName = Workspace.pathBaseName(uri)
   const content = await getContent(uri)
-  const languageId = Languages.getLanguageId(fileName)
-  const tokenizer = Tokenizer.getTokenizer(languageId)
   const newState1 = Editor.setText(state, content)
+  const languageId = getLanguageId(newState1)
+  const tokenizer = Tokenizer.getTokenizer(languageId)
   const savedSelections = getSavedSelections(savedState)
   const savedDeltaY = getSavedDeltaY(savedState)
   const newState2 = Editor.setDeltaYFixedValue(newState1, savedDeltaY)
@@ -111,6 +123,7 @@ export const loadContent = async (state, savedState) => {
 
 export const contentLoaded = async (state) => {
   // Editor.renderText(state)
+  return []
 }
 
 const updateSemanticTokens = async (state) => {
@@ -150,8 +163,7 @@ export const contentLoadedEffects = async (state) => {
   // GlobalEventBus.addListener('languages.changed', handleLanguagesChanged)
   // GlobalEventBus.addListener('tokenizer.changed', handleTokenizeChange)
   // GlobalEventBus.addListener('editor.change', handleEditorChange)
-  const fileName = Workspace.pathBaseName(state.uri)
-  const newLanguageId = Languages.getLanguageId(fileName)
+  const newLanguageId = getLanguageId(state)
   await Command.execute(
     /* Editor.setLanguageId */ 'Editor.setLanguageId',
     /* languageId */ newLanguageId
@@ -163,8 +175,7 @@ export const contentLoadedEffects = async (state) => {
 }
 
 export const handleLanguagesChanged = (state) => {
-  const fileName = Workspace.pathBaseName(state.uri)
-  const newLanguageId = Languages.getLanguageId(fileName)
+  const newLanguageId = getLanguageId(state)
   return EditorCommandSetLanguageId.setLanguageId(state, newLanguageId)
 }
 

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletEmpty/ViewletEmpty.js

@@ -8,8 +8,6 @@ export const loadContent = (state) => {
   return state
 }
 
-export const contentLoaded = async (state) => {}
-
 export const dispose = (state) => {
   return {
     ...state,

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletExplorer/ViewletExplorer.ipc.js

@@ -16,7 +16,11 @@ const Imports = {
   HandleDragOver: () => import('./ViewletExplorerHandleDragOver.js'),
   HandleDrop: () => import('./ViewletExplorerHandleDrop.js'),
   HandlePaste: () => import('./ViewletExplorerHandlePaste.js'),
+}
 
+export const Events = {
+  'languages.changed': ViewletExplorer.handleLanguagesChanged,
+  'workspace.change': ViewletExplorer.handleWorkspaceChange,
 }
 
 // prettier-ignore

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletExplorer/ViewletExplorer.js

@@ -9,6 +9,7 @@ import * as Preferences from '../Preferences/Preferences.js'
 import * as PromiseStatus from '../PromiseStatus/PromiseStatus.js'
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import * as Viewlet from '../Viewlet/Viewlet.js' // TODO should not import viewlet manager -> avoid cyclic dependency
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 import * as Workspace from '../Workspace/Workspace.js'
 import { focusIndex } from './ViewletExplorerFocusIndex.js'
 import {
@@ -20,6 +21,7 @@ import {
   getParentStartIndex,
   getTopLevelDirents,
 } from './ViewletExplorerShared.js'
+
 // TODO viewlet should only have create and refresh functions
 // every thing else can be in a separate module <viewlet>.lazy.js
 // and  <viewlet>.ipc.js
@@ -27,7 +29,7 @@ import {
 // viewlet: creating | refreshing | done | disposed
 // TODO recycle viewlets (maybe)
 
-export const name = 'Explorer'
+export const name = ViewletModuleId.Explorer
 
 // TODO instead of root string, there should be a root dirent
 
@@ -228,41 +230,6 @@ export const updateIcons = (state) => {
   }
 }
 
-export const contentLoaded = async (state) => {
-  // console.trace({ state })
-  // TODO execute command directly
-  // TODO this should a promise and be awaited
-}
-
-// export const contentLoadedEffects = (state) => {
-//   // TODO why is this event emitted?
-//   GlobalEventBus.emitEvent('dirents.update', state.items)
-
-//   // TODO create should not have side effects
-//   // TODO dispose listener when explorer is disposed
-//   // TODO hoist function
-//   const handleLanguagesChanged = () => {
-//     const state = Viewlet.getState('Explorer')
-//     const newState = updateIcons(state)
-//     Viewlet.setState('Explorer', newState)
-//   }
-//   GlobalEventBus.addListener('languages.changed', handleLanguagesChanged)
-
-//   // TODO hoist function
-//   GlobalEventBus.addListener('workspace.change', async () => {
-//     const newRoot = Workspace.state.workspacePath
-//     const state1 = { ...state, root: newRoot }
-//     const newState = await loadContent(state1)
-//     await Viewlet.setState('Explorer', newState)
-//     // await contentLoaded(newState)
-//     // TODO
-//   })
-
-//   GlobalEventBus.addListener('iconTheme.change', async () => {
-//     await contentLoaded(state)
-//   })
-// }
-
 export const handleLanguagesChanged = (state) => {
   return updateIcons(state)
 }
@@ -746,10 +713,11 @@ const handleClickFile = async (state, dirent, index, keepFocus = false) => {
   return {
     ...state,
     focusedIndex: index,
+    focused: keepFocus,
   }
 }
 
-const handleClickDirectory = async (state, dirent, index) => {
+const handleClickDirectory = async (state, dirent, index, keepFocus) => {
   dirent.type = DirentType.DirectoryExpanding
   // TODO handle error
   const dirents = await getChildDirents(state.root, state.pathSeparator, dirent)
@@ -773,19 +741,26 @@ const handleClickDirectory = async (state, dirent, index) => {
     ...state,
     items: newDirents,
     focusedIndex: newIndex,
+    focused: keepFocus,
   }
 }
 
-const handleClickDirectoryExpanding = async (state, dirent, index) => {
+const handleClickDirectoryExpanding = async (
+  state,
+  dirent,
+  index,
+  keepFocus
+) => {
   dirent.type = DirentType.Directory
   dirent.icon = IconTheme.getIcon(dirent)
   return {
     ...state,
     focusedIndex: index,
+    focused: keepFocus,
   }
 }
 
-const handleClickDirectoryExpanded = (state, dirent, index) => {
+const handleClickDirectoryExpanded = (state, dirent, index, keepFocus) => {
   dirent.type = DirentType.Directory
   dirent.icon = IconTheme.getIcon(dirent)
   const endIndex = getParentEndIndex(state.items, index)
@@ -797,6 +772,7 @@ const handleClickDirectoryExpanded = (state, dirent, index) => {
     ...state,
     items: newDirents,
     focusedIndex: index,
+    focused: keepFocus,
   }
 }
 
@@ -819,11 +795,16 @@ export const handleClick = (state, index, keepFocus = false) => {
     // TODO decide on one name
     case DirentType.Directory:
     case DirentType.SymlinkFolder:
-      return handleClickDirectory(state, dirent, actualIndex)
+      return handleClickDirectory(state, dirent, actualIndex, keepFocus)
     case DirentType.DirectoryExpanding:
-      return handleClickDirectoryExpanding(state, dirent, actualIndex)
+      return handleClickDirectoryExpanding(
+        state,
+        dirent,
+        actualIndex,
+        keepFocus
+      )
     case DirentType.DirectoryExpanded:
-      return handleClickDirectoryExpanded(state, dirent, actualIndex)
+      return handleClickDirectoryExpanded(state, dirent, actualIndex, keepFocus)
     case DirentType.Symlink:
       return handleClickSymLink(state, dirent, state.focusedIndex)
     default:
@@ -1332,11 +1313,6 @@ export const shouldApplyNewState = (newState, fn) => {
   return true
 }
 
-export const events = {
-  'languages.changed': handleLanguagesChanged,
-  'workspace.change': handleWorkspaceChange,
-}
-
 export const hasFunctionalRender = true
 
 const renderItems = {
@@ -1371,18 +1347,15 @@ const renderFocusedIndex = {
     )
   },
   apply(oldState, newState) {
-    const oldFocusedIndex = oldState.focused
-      ? oldState.focusedIndex - oldState.minLineY
-      : -2
-    const newFocusedIndex = newState.focused
-      ? newState.focusedIndex - newState.minLineY
-      : -2
+    const oldFocusedIndex = oldState.focusedIndex - oldState.minLineY
+    const newFocusedIndex = newState.focusedIndex - newState.minLineY
     return [
       /* Viewlet.send */ 'Viewlet.send',
       /* id */ 'Explorer',
       /* method */ 'setFocusedIndex',
       /* oldindex */ oldFocusedIndex,
       /* newIndex */ newFocusedIndex,
+      /* focused */ newState.focused,
     ]
   },
 }

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletExplorer/ViewletExplorerFocusIndex.js

@@ -1,4 +1,5 @@
 export const focusIndex = (state, index) => {
+  const { minLineY, maxLineY } = state
   if (index < state.minLineY) {
     if (index < 0) {
       return {
@@ -7,7 +8,7 @@ export const focusIndex = (state, index) => {
         focused: true,
       }
     }
-    const diff = state.maxLineY - state.minLineY
+    const diff = maxLineY - minLineY
     return {
       ...state,
       focusedIndex: index,
@@ -15,8 +16,9 @@ export const focusIndex = (state, index) => {
       minLineY: index,
       maxLineY: index + diff,
     }
-  } else if (index >= state.maxLineY) {
-    const diff = state.maxLineY - state.minLineY
+  }
+  if (index >= maxLineY) {
+    const diff = maxLineY - minLineY
     return {
       ...state,
       focusedIndex: index,

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletExtensionDetail/ViewletExtensionDetail.js

@@ -9,8 +9,9 @@ import * as Path from '../Path/Path.js'
 import * as Platform from '../Platform/Platform.js'
 import * as PlatformType from '../PlatformType/PlatformType.js'
 import * as SanitizeHtml from '../SanitizeHtml/SanitizeHtml.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'ExtensionDetail'
+export const name = ViewletModuleId.ExtensionDetail
 
 export const create = (id, uri) => {
   return {

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletExtensions/ViewletExtensions.js

@@ -6,6 +6,7 @@ import * as ExtensionManagement from '../ExtensionManagement/ExtensionManagement
 import * as ExtensionsMarketplace from '../ExtensionMarketplace/ExtensionMarketplace.js'
 import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 import {
   getListHeight,
   HEADER_HEIGHT,
@@ -23,7 +24,7 @@ const SUGGESTIONS = [
   '@category',
 ]
 
-export const name = 'Extensions'
+export const name = ViewletModuleId.Extensions
 
 // then state can be recycled by Viewlet when there is only a single ViewletExtensions instance
 
@@ -89,27 +90,6 @@ export const loadContent = async (state) => {
   }
 }
 
-export const contentLoaded = async (state) => {
-  // if (state.searchValue === '') {
-  //   const visible = getVisible(state)
-  //   await RendererProcess.invoke(
-  //     /* Viewlet.invoke */ 'Viewlet.send',
-  //     /* id */ 'Extensions',
-  //     /* method */ 'setExtensions',
-  //     /* viewObjects */ visible,
-  //     /* negativeMargin */ -state.deltaY
-  //   )
-  //   return
-  // }
-  // await RendererProcess.invoke(
-  //   /* Viewlet.invoke */ 'Viewlet.send',
-  //   /* id */ 'Extensions',
-  //   /* method */ 'setExtensions',
-  //   /* viewObjects */ [],
-  //   /* negativeMargin */ 0
-  // )
-}
-
 const toInstalledViewObject = (extension) => {
   return {
     name: ExtensionDisplay.getName(extension),

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletIframe/ViewletIframe.js

@@ -1,4 +1,6 @@
-export const name = 'Iframe'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
+
+export const name = ViewletModuleId.Iframe
 
 export const create = (id) => {
   return {
@@ -15,8 +17,6 @@ export const loadContent = async (state, src) => {
   }
 }
 
-export const contentLoaded = async (state) => {}
-
 export const dispose = (state) => {
   return {
     ...state,

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletImplementations/ViewletImplementations.js

@@ -1,9 +1,10 @@
 import * as ExtensionHostImplementation from '../ExtensionHost/ExtensionHostImplementation.js'
 import * as TextDocument from '../TextDocument/TextDocument.js'
 import * as ViewletLocations from '../ViewletLocations/ViewletLocations.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 
-export const name = 'Implementations'
+export const name = ViewletModuleId.Implementations
 
 // TODO speed up this function by 130% by not running activation event (onReferences) again and again
 // e.g. (21ms activation event, 11ms getReferences) => (11ms getReferences)
@@ -32,6 +33,7 @@ export const contentLoaded = (state) => {
     factory: ViewletLocations,
     state,
   })
+  return []
 }
 
 export const dispose = ViewletLocations.dispose

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletKeyBindings/ViewletKeyBindings.ipc.js

@@ -2,9 +2,9 @@ import * as ViewletKeyBindings from './ViewletKeyBindings.js'
 
 // prettier-ignore
 export const Commands = {
+  'KeyBindings.handleClick':ViewletKeyBindings.handleClick,
   'KeyBindings.handleInput':ViewletKeyBindings.handleInput,
   'KeyBindings.handleWheel':ViewletKeyBindings.handleWheel,
-  'KeyBindings.handleClick':ViewletKeyBindings.handleClick,
 }
 
 export * from './ViewletKeyBindings.js'

package/static/{372bf21 → d5c500f}/packages/renderer-worker/src/parts/ViewletKeyBindings/ViewletKeyBindings.js

@@ -5,8 +5,9 @@
 import * as FilterKeyBindings from '../FilterKeyBindings/FilterKeyBindings.js'
 import * as KeyBindingsInitial from '../KeyBindingsInitial/KeyBindingsInitial.js'
 import * as ParseKeyBindings from '../ParseKeyBindings/ParseKeyBindings.js'
+import * as ViewletModuleId from '../ViewletModuleId/ViewletModuleId.js'
 
-export const name = 'KeyBindings'
+export const name = ViewletModuleId.KeyBindings
 
 export const create = (id, uri, left, top, width, height) => {
   return {

package/static/d5c500f/packages/renderer-worker/src/parts/ViewletLayout/ViewletLayout.ipc.js

@@ -0,0 +1,38 @@
+import * as ViewletLayout from './ViewletLayout.js'
+
+// prettier-ignore
+export const Commands = {
+  'Layout.handleSashPointerDown': ViewletLayout.handleSashPointerDown,
+}
+
+export const CommandsWithSideEffects = {
+  'Layout.handleResize': ViewletLayout.handleResize,
+  'Layout.handleSashDoubleClick': ViewletLayout.handleSashDoubleClick,
+  'Layout.handleSashPointerMove': ViewletLayout.handleSashPointerMove,
+  'Layout.hideActivityBar': ViewletLayout.hideActivityBar,
+  'Layout.hideMain': ViewletLayout.hideMain,
+  'Layout.hidePanel': ViewletLayout.hidePanel,
+  'Layout.hideSideBar': ViewletLayout.hideSideBar,
+  'Layout.hideStatusBar': ViewletLayout.hideStatusBar,
+  'Layout.hideTitleBar': ViewletLayout.hideTitleBar,
+  'Layout.loadActivityBarIfVisible': ViewletLayout.loadActivityBarIfVisible,
+  'Layout.loadMainIfVisible': ViewletLayout.loadMainIfVisible,
+  'Layout.loadPanelIfVisible': ViewletLayout.loadPanelIfVisible,
+  'Layout.loadSideBarIfVisible': ViewletLayout.loadSideBarIfVisible,
+  'Layout.loadStatusBarIfVisible': ViewletLayout.loadStatusBarIfVisible,
+  'Layout.loadTitleBarIfVisible': ViewletLayout.loadTitleBarIfVisible,
+  'Layout.showActivityBar': ViewletLayout.showActivityBar,
+  'Layout.showMain': ViewletLayout.showMain,
+  'Layout.showPanel': ViewletLayout.showPanel,
+  'Layout.showSideBar': ViewletLayout.showSideBar,
+  'Layout.showStatusBar': ViewletLayout.showStatusBar,
+  'Layout.showTitleBar': ViewletLayout.showTitleBar,
+  'Layout.toggleActivityBar': ViewletLayout.toggleActivityBar,
+  'Layout.toggleMain': ViewletLayout.toggleMain,
+  'Layout.togglePanel': ViewletLayout.togglePanel,
+  'Layout.toggleSideBar': ViewletLayout.toggleSideBar,
+  'Layout.toggleStatusBar': ViewletLayout.toggleStatusBar,
+  'Layout.toggleTitleBar': ViewletLayout.toggleTitleBar,
+}
+
+export * from './ViewletLayout.js'