@lvce-editor/server 0.7.4 → 0.7.6

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

@@ -1,6 +1,6 @@
 import * as Assert from '../Assert/Assert.js'
-import * as Platform from '../Platform/Platform.js'
 import * as GlobalEventBus from '../GlobalEventBus/GlobalEventBus.js'
+import * as Platform from '../Platform/Platform.js'
 
 export const applyEdits = (editor, cursor) => {
   // TODO multiple cursors
@@ -61,13 +61,14 @@ export const getVisible = (editor) => {
   // TODO could use uint16array here
   // TODO handle case when text segmenter not supported
   const visibleCursors = []
-  const selections = editor.selections
-  for (let i = 0; i < selections.length; i += 4) {
+  const { selections, minLineY, maxLineY, rowHeight } = editor
+  const selectionLength = selections.length
+  for (let i = 0; i < selectionLength; i += 4) {
     const selectionStartRow = selections[i]
     const selectionStartColumn = selections[i + 1]
     const selectionEndRow = selections[i + 2]
     const selectionEndColumn = selections[i + 3]
-    if (isInRange(selectionEndRow, editor.minLineY, editor.maxLineY)) {
+    if (isInRange(selectionEndRow, minLineY, maxLineY)) {
       const lineCache = editor.lineCache[selectionEndRow + 1]
       if (!lineCache) {
         console.log('line caches', editor, editor.lineCache)
@@ -75,8 +76,8 @@ export const getVisible = (editor) => {
       const tokenIndex = getTokenIndex(lineCache, selectionEndColumn)
       // TODO maybe don't allocate object here, push numbers to flat array instead
       visibleCursors.push({
-        top: (selectionEndRow - editor.minLineY) * editor.rowHeight,
-        topIndex: selectionEndRow - editor.minLineY,
+        top: (selectionEndRow - minLineY) * rowHeight,
+        topIndex: selectionEndRow - minLineY,
         leftIndex: tokenIndex.index,
         remainingOffset: tokenIndex.offset,
       })

package/static/320aa1b/packages/renderer-worker/src/parts/Editor/EditorScrolling.js

@@ -0,0 +1,23 @@
+const clamp = (value, min, max) => {
+  return Math.min(Math.max(value, min), max)
+}
+
+// TODO this should be in a separate scrolling module
+export const setDeltaY = (editor, value) => {
+  const { finalDeltaY, deltaY, numberOfVisibleLines, height, scrollBarHeight } =
+    editor
+  const newDeltaY = clamp(value, 0, finalDeltaY)
+  if (deltaY === newDeltaY) {
+    return editor
+  }
+  const newMinLineY = Math.floor(newDeltaY / 20)
+  const newMaxLineY = newMinLineY + numberOfVisibleLines
+  const scrollBarY = (newDeltaY / finalDeltaY) * (height - scrollBarHeight)
+  return {
+    ...editor,
+    minLineY: newMinLineY,
+    maxLineY: newMaxLineY,
+    deltaY: newDeltaY,
+    scrollBarY,
+  }
+}

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

@@ -59,47 +59,14 @@ const getTokensFromCache = (result) => {
 const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
   const invalidStartIndex = editor.invalidStartIndex
   const lineCache = editor.lineCache
-  if (endLineIndex <= invalidStartIndex) {
-    return lineCache
-      .slice(startLineIndex + 1, endLineIndex + 1)
-      .map(getTokensFromCache)
-  }
   const hasArrayReturn = editor.tokenizer.hasArrayReturn
-
+  const tokenizeStartIndex = Math.min(invalidStartIndex, startLineIndex)
+  const tokenizeEndIndex =
+    invalidStartIndex < endLineIndex ? endLineIndex : tokenizeStartIndex
   const tokenizeLine = editor.tokenizer.tokenizeLine
-  if (startLineIndex <= invalidStartIndex) {
-    for (let i = invalidStartIndex; i < endLineIndex; i++) {
-      const lineState =
-        i === 0 ? editor.tokenizer.initialLineState : editor.lineCache[i]
-      const line = editor.lines[i]
-      const result = SafeTokenizeLine.safeTokenizeLine(
-        tokenizeLine,
-        line,
-        lineState,
-        hasArrayReturn
-      )
-      // TODO if lineCacheEnd matches the one before, skip tokenizing lines after
-      lineCache[i + 1] = result
-    }
-    editor.invalidStartIndex = endLineIndex
-    return lineCache
-      .slice(startLineIndex + 1, endLineIndex + 1)
-      .map(getTokensFromCache)
-  }
-  // TODO combine for loops
-  for (let i = invalidStartIndex; i < startLineIndex; i++) {
-    const lineState = editor.lineCache[i]
-    const line = editor.lines[i]
-    const result = SafeTokenizeLine.safeTokenizeLine(
-      tokenizeLine,
-      line,
-      lineState,
-      hasArrayReturn
-    )
-    lineCache[i + 1] = result
-  }
-  for (let i = startLineIndex; i < endLineIndex; i++) {
-    const lineState = editor.lineCache[i]
+  for (let i = tokenizeStartIndex; i < tokenizeEndIndex; i++) {
+    const lineState =
+      i === 0 ? editor.tokenizer.initialLineState : editor.lineCache[i]
     const line = editor.lines[i]
     const result = SafeTokenizeLine.safeTokenizeLine(
       tokenizeLine,
@@ -107,9 +74,11 @@ const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
       lineState,
       hasArrayReturn
     )
+
+    // TODO if lineCacheEnd matches the one before, skip tokenizing lines after
     lineCache[i + 1] = result
-    editor.invalidStartIndex = endLineIndex
   }
+  editor.invalidStartIndex = Math.max(invalidStartIndex, tokenizeEndIndex)
   return lineCache
     .slice(startLineIndex + 1, endLineIndex + 1)
     .map(getTokensFromCache)
@@ -263,9 +232,8 @@ const getLineInfosViewport = (
   minLineOffset
 ) => {
   const result = []
-  const lines = editor.lines
-  const TokenMap = editor.tokenizer.TokenMap
-  const decorations = editor.decorations
+  const { lines, tokenizer, decorations } = editor
+  const { TokenMap } = tokenizer
   let offset = minLineOffset
   for (let i = minLineY; i < maxLineY; i++) {
     const line = lines[i]
@@ -283,11 +251,8 @@ export const getVisible = (editor) => {
   // currently hard to test because need to mock editor height, top, left,
   // invalidStartIndex, lineCache, etc. just for testing editorType
   // editor.invalidStartIndex = changes[0].start.rowIndex
-  const minLineY = editor.minLineY
-  const maxLineY = Math.min(
-    editor.minLineY + editor.numberOfVisibleLines,
-    editor.lines.length
-  )
+  const { minLineY, numberOfVisibleLines, lines } = editor
+  const maxLineY = Math.min(minLineY + numberOfVisibleLines, lines.length)
   const tokens = getTokensViewport(editor, minLineY, maxLineY)
   const minLineOffset = TextDocument.offsetAt(editor, minLineY, 0)
   const textInfos = getLineInfosViewport(

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

@@ -34,16 +34,12 @@ export const editorHandleScrollBarClick = (editor, y) => {
   const currentScrollBarY =
     (editor.deltaY / editor.finalDeltaY) *
     (editor.height - editor.scrollBarHeight)
-  console.log({ scrollBarY: currentScrollBarY, relativeY })
   const diff = relativeY - currentScrollBarY
-  console.log({ diff })
   if (diff >= 0 && diff < editor.scrollBarHeight) {
     state.handleOffset = diff
-    console.log({ handleOffset: diff })
     return editor
   }
   const newPercent = getNewDeltaPercent(editor, relativeY)
-  console.log({ newPercent })
   // TODO
   state.handleOffset = editor.scrollBarHeight / 2
   // TODO when diff is greater, position scrollbar in the middle around cursor

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

@@ -2,7 +2,6 @@ import * as Editor from '../Editor/Editor.js'
 import * as EditorHandleScrollBarClick from './EditorCommandHandleScrollBarClick.js'
 
 const getNewPercent = (editor, relativeY) => {
-  console.log({ editor, relativeY })
   // if (relativeY <= editor.scrollBarHeight / 2) {
   //   console.log('clicked at top')
   //   // clicked at top
@@ -19,7 +18,6 @@ const getNewPercent = (editor, relativeY) => {
 export const editorHandleScrollBarMove = (editor, y) => {
   const relativeY =
     y - editor.top - EditorHandleScrollBarClick.state.handleOffset
-  console.log('handle offset', EditorHandleScrollBarClick.state.handleOffset)
   const newPercent = getNewPercent(editor, relativeY)
   const newDeltaY = newPercent * editor.finalDeltaY
   return Editor.setDeltaYFixedValue(editor, newDeltaY)

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

@@ -79,6 +79,7 @@ const getSelectionEditsSingleLineWord = (lines, selections) => {
     }
   }
   let selectionIndex = 0
+  // TODO use text document search for this
   for (let i = 0; i <= rowIndex; i++) {
     const line = lines[i]
     let columnIndex = -word.length