@lvce-editor/server 0.7.4 → 0.7.6

package/static/{ce25a54 → 320aa1b}/packages/renderer-worker/src/parts/Viewlet/Viewlet.js

@@ -5,6 +5,7 @@ import * as Assert from '../Assert/Assert.js'
 import * as ViewletManager from '../ViewletManager/ViewletManager.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 import * as ViewletModule from '../ViewletModule/ViewletModule.js'
+import * as NameAnonymousFunction from '../NameAnonymousFunction/NameAnonymousFunction.js'
 
 /**
  * @deprecated
@@ -155,7 +156,7 @@ export const wrapViewletCommand = (id, fn) => {
       return fn(activeInstance.state, ...args)
     }
   }
-
+  NameAnonymousFunction.nameAnonymousFunction(wrappedViewletCommand, fn.name)
   return wrappedViewletCommand
 }
 

package/static/{ce25a54 → 320aa1b}/packages/renderer-worker/src/parts/Viewlet/ViewletExtensionsList.js

@@ -454,7 +454,6 @@ const getNewPercent = (state, relativeY) => {
 
 export const handleScrollBarMove = (state, y) => {
   const relativeY = y - state.top - state.handleOffset
-  console.log('handle offset', state.handleOffset)
   const newPercent = getNewPercent(state, relativeY)
   const newDeltaY = newPercent * state.finalDeltaY
   console.log({ relativeY, newPercent, newDeltaY })

package/static/{ce25a54 → 320aa1b}/packages/renderer-worker/src/parts/ViewletActivityBar/ViewletActivityBar.js

@@ -5,6 +5,7 @@ import * as I18nString from '../I18NString/I18NString.js'
 import * as RendererProcess from '../RendererProcess/RendererProcess.js'
 import * as ViewletStates from '../ViewletStates/ViewletStates.js'
 import * as MenuEntryId from '../MenuEntryId/MenuEntryId.js'
+import * as Icon from '../Icon/Icon.js'
 
 /**
  * @enum {string}
@@ -53,7 +54,7 @@ const getVisibleActivityBarItems = (state) => {
   const showMoreItem = {
     id: 'Additional Views',
     title: I18nString.i18nString(UiStrings.AdditionalViews),
-    icon: 'icons/ellipsis.svg',
+    icon: Icon.Ellipsis,
     enabled: true,
     flags: ActivityBarItemFlags.Button,
     keyShortCuts: '',
@@ -94,7 +95,7 @@ const getActivityBarItems = () => {
     {
       id: 'Explorer',
       title: I18nString.i18nString(UiStrings.Explorer),
-      icon: 'icons/files.svg',
+      icon: Icon.Files,
       enabled: true,
       flags: ActivityBarItemFlags.Tab,
       keyShortcuts: 'Control+Shift+E',
@@ -102,7 +103,7 @@ const getActivityBarItems = () => {
     {
       id: 'Search',
       title: I18nString.i18nString(UiStrings.Search),
-      icon: 'icons/search.svg',
+      icon: Icon.Search,
       enabled: true,
       flags: ActivityBarItemFlags.Tab,
       keyShortcuts: 'Control+Shift+F',
@@ -110,7 +111,7 @@ const getActivityBarItems = () => {
     {
       id: 'Source Control',
       title: I18nString.i18nString(UiStrings.SourceControl),
-      icon: 'icons/source-control.svg',
+      icon: Icon.SourceControl,
       enabled: true,
       flags: ActivityBarItemFlags.Tab,
       keyShortcuts: 'Control+Shift+G',
@@ -118,7 +119,7 @@ const getActivityBarItems = () => {
     {
       id: 'Run and Debug',
       title: I18nString.i18nString(UiStrings.RunAndDebug),
-      icon: 'icons/debug-alt-2.svg',
+      icon: Icon.DebugAlt2,
       enabled: true,
       flags: ActivityBarItemFlags.Tab,
       keyShortcuts: 'Control+Shift+D',
@@ -126,7 +127,7 @@ const getActivityBarItems = () => {
     {
       id: 'Extensions',
       title: I18nString.i18nString(UiStrings.Extensions),
-      icon: 'icons/extensions.svg',
+      icon: Icon.Extensions,
       enabled: true,
       flags: ActivityBarItemFlags.Tab,
       keyShortcuts: 'Control+Shift+X',
@@ -135,7 +136,7 @@ const getActivityBarItems = () => {
     {
       id: 'Settings',
       title: I18nString.i18nString(UiStrings.Settings),
-      icon: 'icons/settings-gear.svg',
+      icon: Icon.SettingsGear,
       enabled: true,
       flags: ActivityBarItemFlags.Button,
       keyShortcuts: '',

package/static/{ce25a54 → 320aa1b}/packages/renderer-worker/src/parts/ViewletEditorCompletion/ViewletEditorCompletion.ipc.js

@@ -9,7 +9,7 @@ export const Commands = {
   'EditorCompletion.focusNext': Viewlet.wrapViewletCommand('EditorCompletion', ViewletEditorCompletion.focusNext),
   'EditorCompletion.focusPrevious': Viewlet.wrapViewletCommand('EditorCompletion', ViewletEditorCompletion.focusPrevious),
   'EditorCompletion.handleWheel': Viewlet.wrapViewletCommand('EditorCompletion', ViewletEditorCompletion.handleWheel),
-  'EditorCompletion.selectCurrent': Viewlet.wrapViewletCommand('EditorCompletion', ViewletEditorCompletion.selectCurrent),
+  // 'EditorCompletion.selectCurrent': Viewlet.wrapViewletCommand('EditorCompletion', ViewletEditorCompletion.selectCurrent),
   'EditorCompletion.selectIndex': Viewlet.wrapViewletCommand('EditorCompletion', ViewletEditorCompletion.selectIndex),
 }
 

package/static/{ce25a54 → 320aa1b}/packages/renderer-worker/src/parts/ViewletEditorFindWidget/ViewletEditorFindWidget.js

@@ -1,15 +1,25 @@
-import * as ViewletStates from '../ViewletStates/ViewletStates.js'
-import * as TextDocumentSearch from '../TextDocumentSearch/TextDocumentSearch.js'
 import * as Command from '../Command/Command.js'
+import * as I18nString from '../I18NString/I18NString.js'
+import * as TextDocumentSearch from '../TextDocumentSearch/TextDocumentSearch.js'
+import * as ViewletStates from '../ViewletStates/ViewletStates.js'
+
+/**
+ * @enum {string}
+ */
+const UiStrings = {
+  MatchesFoundFor: `{PH1} of {PH2} found for {PH3}`,
+  MatchOf: `{PH1} of {PH2}`,
+}
 
 export const name = 'EditorFindWidget'
 
 export const create = () => {
   return {
     value: '',
-    matchIndex: 0,
-    totalMatches: 0,
     ariaAnnouncement: '',
+    matches: new Uint32Array(),
+    matchIndex: 0,
+    matchCount: 0,
   }
 }
 
@@ -23,7 +33,7 @@ export const getPosition = () => {
       height: 0,
     }
   }
-  const width = 200
+  const width = 300
   const height = 30
   const paddingTop = 10
   const paddingRight = 20
@@ -54,13 +64,13 @@ export const loadContent = (state) => {
   const line = lines[startRowIndex]
   const value = line.slice(startColumnIndex, endColumnIndex)
   const matches = TextDocumentSearch.findMatches(lines, value)
-  const totalMatches = getMatchCount(matches)
-
+  const matchCount = getMatchCount(matches)
   return {
     ...state,
     value,
-    matchIndex: 1,
-    totalMatches,
+    matches,
+    matchIndex: 0,
+    matchCount,
   }
 }
 
@@ -68,80 +78,65 @@ export const handleInput = (state, value) => {
   // TODO get focused editor
   // highlight locations that match value
   const editor = ViewletStates.getState('EditorText')
-  const { lines, selections } = editor
-  const startRowIndex = selections[0]
-  const startColumnIndex = selections[1]
-  const endRowIndex = selections[2]
-  const endColumnIndex = selections[3]
+  const { lines } = editor
   const matches = TextDocumentSearch.findMatches(lines, value)
-  const totalMatches = getMatchCount(matches)
+  const matchCount = getMatchCount(matches)
   return {
     ...state,
+    matches,
+    matchIndex: 0,
+    matchCount,
     value,
-    totalMatches,
   }
 }
 
 // TODO this function should be synchronous
-export const focusNext = async (state) => {
-  const { value, matchIndex } = state
-  const editor = ViewletStates.getState('EditorText')
-  const { lines, selections } = editor
-  const startRowIndex = selections[0]
-  const startColumnIndex = selections[1]
-  const endRowIndex = selections[2]
-  const endColumnIndex = selections[3]
+export const focusIndex = async (state, index) => {
+  const { value, matches, matchIndex } = state
+  if (index === matchIndex) {
+    return state
+  }
   // TODO find next match and highlight it
-  const nextMatch = TextDocumentSearch.findNextMatch(
-    lines,
-    value,
-    startRowIndex + 1
-  )
+  const matchRowIndex = matches[index * 2]
+  const matchColumnIndex = matches[index * 2 + 1]
   const newSelections = new Uint32Array([
-    nextMatch.rowIndex,
-    nextMatch.columnIndex,
-    nextMatch.rowIndex,
-    nextMatch.columnIndex + value.length,
+    matchRowIndex,
+    matchColumnIndex,
+    matchRowIndex,
+    matchColumnIndex + value.length,
   ])
   // TODO set selections synchronously and render input match index,
   // input value and new selections at the same time
   await Command.execute('Editor.setSelections', newSelections)
-  // TODO reveal new position in editor
   return {
     ...state,
-    matchIndex: matchIndex + 1,
+    matchIndex: index,
   }
 }
 
-// TODO should be synchronous
-export const focusPrevious = async (state) => {
-  const { value, matchIndex } = state
-  const editor = ViewletStates.getState('EditorText')
-  const { lines, selections } = editor
-  const startRowIndex = selections[0]
-  const startColumnIndex = selections[1]
-  const endRowIndex = selections[2]
-  const endColumnIndex = selections[3]
-  // TODO find next match and highlight it
-  const nextMatch = TextDocumentSearch.findPreviousMatch(
-    lines,
-    value,
-    startRowIndex - 1
-  )
-  const newSelections = new Uint32Array([
-    nextMatch.rowIndex,
-    nextMatch.columnIndex,
-    nextMatch.rowIndex,
-    nextMatch.columnIndex + value.length,
-  ])
-  // TODO set selections synchronously and render input match index,
-  // input value and new selections at the same time
-  await Command.execute('Editor.setSelections', newSelections)
-  // TODO reveal new position in editor
-  return {
-    ...state,
-    matchIndex: matchIndex - 1,
+export const focusFirst = (state) => {
+  return focusIndex(state, 0)
+}
+
+export const focusLast = (state) => {
+  const { matchCount } = state
+  return focusIndex(state, matchCount - 1)
+}
+
+export const focusNext = (state) => {
+  const { matchIndex, matchCount } = state
+  if (matchIndex === matchCount - 1) {
+    return focusFirst(state)
+  }
+  return focusIndex(state, matchIndex + 1)
+}
+
+export const focusPrevious = (state) => {
+  const { matchIndex } = state
+  if (matchIndex === 0) {
+    return focusLast(state)
   }
+  return focusIndex(state, matchIndex - 1)
 }
 
 export const hasFunctionalRender = true
@@ -164,11 +159,14 @@ const renderMatchCount = {
   isEqual(oldState, newState) {
     return (
       oldState.matchIndex === newState.matchIndex &&
-      oldState.totalMatches === newState.totalMatches
+      oldState.matchCount === newState.matchCount
     )
   },
   apply(oldState, newState) {
-    const matchCountText = `${newState.matchIndex} of ${newState.totalMatches}`
+    const matchCountText = I18nString.i18nString(UiStrings.MatchOf, {
+      PH1: newState.matchIndex + 1,
+      PH2: newState.matchCount,
+    })
     return [
       /* Viewlet.invoke */ 'Viewlet.send',
       /* id */ 'EditorFindWidget',
@@ -179,7 +177,12 @@ const renderMatchCount = {
 }
 
 const getAriaLabel = (state) => {
-  return `${state.matchIndex} of ${state.totalMatches} found for ${state.value}`
+  const { matchIndex, matchCount, value } = state
+  return I18nString.i18nString(UiStrings.MatchesFoundFor, {
+    PH1: matchIndex,
+    PH2: matchCount,
+    PH3: value,
+  })
 }
 
 const renderAriaAnnouncement = {
@@ -187,7 +190,7 @@ const renderAriaAnnouncement = {
     return (
       oldState.ariaAnnouncement === newState.ariaAnnouncement &&
       oldState.matchIndex === newState.matchIndex &&
-      oldState.totalMatches === newState.totalMatches &&
+      oldState.matchCount === newState.matchCount &&
       oldState.value === newState.value
     )
   },

package/static/{ce25a54 → 320aa1b}/packages/renderer-worker/src/parts/ViewletEditorText/ViewletEditorText.ipc.js

@@ -1,4 +1,6 @@
 import * as LazyCommand from '../LazyCommand/LazyCommand.js'
+import * as ViewletEditorText from './ViewletEditorText.js'
+import * as Viewlet from '../Viewlet/Viewlet.js'
 
 // prettier-ignore
 const Imports = {
@@ -179,4 +181,11 @@ export const Commands = {
   'Editor.unindent': LazyCommand.create('EditorText', Imports.UnIndent, 'selectUp'),
 }
 
+// prettier-ignore
+export const events = {
+  'languages.changed': ViewletEditorText.handleLanguagesChanged,
+  // 'editor.change': ViewletEditorText.handleEditorChange,
+  // 'tokenizer.changed': ViewletEditorText.handleTokenizeChange,
+}
+
 export * from './ViewletEditorText.js'

package/static/{ce25a54 → 320aa1b}/packages/renderer-worker/src/parts/ViewletEditorText/ViewletEditorText.js

@@ -11,6 +11,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'
 
 const COLUMN_WIDTH = 9 // TODO compute this automatically once
 
@@ -20,7 +21,7 @@ const getContent = async (uri) => {
 }
 
 // TODO how to connect this function with tokenizer?
-const handleTokenizeChange = () => {
+export const handleTokenizeChange = () => {
   const instances = ViewletStates.getAllInstances()
   const instance = instances.EditorText
   if (!instance) {
@@ -55,9 +56,11 @@ export const create = (id, uri, left, top, width, height) => {
 }
 
 export const saveState = (state) => {
+  const { selections, focused, deltaY, minLineY } = state
   return {
-    selections: [...Array.from(state.selections)],
-    focused: state.focused,
+    selections: [...Array.from(selections)],
+    focused,
+    deltaY,
   }
 }
 
@@ -75,25 +78,36 @@ const getSavedFocus = (savedState) => {
   return false
 }
 
+const getSavedDeltaY = (savedState) => {
+  if (savedState && savedState.deltaY) {
+    return savedState.deltaY
+  }
+  return 0
+}
+
 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(state.uri)
+  const fileName = Workspace.pathBaseName(uri)
+  const content = await getContent(uri)
   const languageId = Languages.getLanguageId(fileName)
   const tokenizer = Tokenizer.getTokenizer(languageId)
-  const content = await getContent(state.uri)
-  const newState = Editor.setText(state, content)
+  const newState1 = Editor.setText(state, content)
   const savedSelections = getSavedSelections(savedState)
   const savedFocus = getSavedFocus(savedState)
+  const savedDeltaY = getSavedDeltaY(savedState)
+  const newState2 = Editor.setDeltaYFixedValue(newState1, savedDeltaY)
   return {
-    ...newState,
+    ...newState2,
     rowHeight,
     fontSize,
     letterSpacing,
     tokenizer,
     selections: savedSelections,
     focused: savedFocus,
+    deltaY: savedDeltaY,
   }
 }
 
@@ -125,18 +139,19 @@ const updateSemanticTokens = async (state) => {
   }
 }
 
-const handleEditorChange = async (editor, changes) => {
+export const handleEditorChange = async (editor, changes) => {
   // await ExtensionHostTextDocument.handleEditorChange(editor, changes)
   // TODO check if semantic highlighting is enabled in settings
   await updateSemanticTokens(editor)
+  return editor
 }
 
 export const contentLoadedEffects = async (state) => {
   // TODO dispose listener
   // TODO don't like side effect here, where to put it?
-  GlobalEventBus.addListener('languages.changed', handleLanguagesChanged)
-  GlobalEventBus.addListener('tokenizer.changed', handleTokenizeChange)
-  GlobalEventBus.addListener('editor.change', handleEditorChange)
+  // 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)
   await Command.execute(
@@ -149,33 +164,10 @@ export const contentLoadedEffects = async (state) => {
   GlobalEventBus.emitEvent('editor.create', state)
 }
 
-const handleLanguagesChanged = async () => {
-  const instances = ViewletStates.getAllInstances()
-  const instance = instances.EditorText
-  if (!instance) {
-    console.log('no text editor')
-    return
-  }
-  const state = instance.state
+export const handleLanguagesChanged = (state) => {
   const fileName = Workspace.pathBaseName(state.uri)
   const newLanguageId = Languages.getLanguageId(fileName)
-  state.languageId = newLanguageId
-  // await ExtensionHostTextDocument.handleEditorLanguageChange(state)
-  // if (state.languageId === newLanguageId) {
-  //   return
-  // }
-  // await Promise.all([
-  //   Editor.setLanguageId(state, newLanguageId),
-  // ])
-  await Command.execute(
-    /* Editor.setLanguageId */ 'Editor.setLanguageId',
-    /* languageId */ newLanguageId
-  )
-
-  const newEditor = instances.EditorText.state
-
-  GlobalEventBus.emitEvent('editor.languageChange', newEditor, newLanguageId)
-  // console.log({ state })
+  return EditorCommandSetLanguageId.setLanguageId(state, newLanguageId)
 }
 
 export const resize = (state, dimensions) => {
@@ -203,3 +195,7 @@ export const focus = (state) => {
     focused: true,
   }
 }
+
+export const shouldApplyNewState = (newState) => {
+  return true
+}