feature: update dependencies

package.json

@@ -37,8 +37,8 @@
     "printWidth": 170
   },
   "devDependencies": {
-    "@lvce-editor/eslint-config": "^18.5.0",
-    "eslint": "^10.8.1",
+    "@lvce-editor/eslint-config": "^18.14.2",
+    "eslint": "^10.11.0",
     "knip": "^6.32.2",
     "prettier": "^3.9.6",
     "typescript": "^6.0.3"

packages/build/src/config.ts

@@ -2,7 +2,7 @@ import { join } from 'node:path'
 import { pathToFileURL } from 'node:url'
 import { root } from './root.ts'
 
-export const threshold = 543_000
+export const threshold = 546_000
 
 export const instantiations = 8000
 

packages/diff-view/src/parts/GetInlineDiffEditorVirtualDom/GetInlineDiffEditorVirtualDom.ts

@@ -11,6 +11,9 @@ import { getInlineDiffRows } from '../GetInlineDiffRows/GetInlineDiffRows.ts'
 import { getScrollBarDom } from '../GetScrollBarDom/GetScrollBarDom.ts'
 import { mergeClassNames } from '../MergeClassNames/MergeClassNames.ts'
 
+const inlineDiffEditorClassName = mergeClassNames(ClassNames.Viewlet, ClassNames.DiffEditor, ClassNames.InlineDiffEditor)
+const inlineDiffEditorContentClassName = mergeClassNames(ClassNames.DiffEditorContent, ClassNames.InlineDiffEditorContent)
+
 export const getInlineDiffEditorVirtualDom = (
   contentLeft: string,
   contentRight: string,
@@ -44,14 +47,14 @@ export const getInlineDiffEditorVirtualDom = (
   return [
     {
       childCount: (scrollBarActive ? 3 : 2) + (searchVisible ? 1 : 0),
-      className: mergeClassNames(ClassNames.Viewlet, ClassNames.DiffEditor, ClassNames.InlineDiffEditor),
+      className: inlineDiffEditorClassName,
       onWheel: DomEventListenerFunctions.HandleWheel,
       type: VirtualDomElements.Div,
     },
     ...searchHeaderDom,
     {
       childCount: contentChildCount,
-      className: mergeClassNames(ClassNames.DiffEditorContent, ClassNames.InlineDiffEditorContent),
+      className: inlineDiffEditorContentClassName,
       type: VirtualDomElements.Div,
     },
     ...lineNumberDom,

packages/diff-view/src/parts/GetLineNumberClassName/GetLineNumberClassName.ts

@@ -5,15 +5,19 @@ import { VisibleLineType, type VisibleLine } from '../VisibleLine/VisibleLine.ts
 
 type LineNumberType = VisibleLine['type'] | InlineDiffRow['type']
 
+const diffEditorLineNumberDeletionClassName = mergeClassNames(ClassNames.DiffEditorLineNumber, ClassNames.DiffEditorLineNumberDeletion)
+const diffEditorLineNumberInsertionClassName = mergeClassNames(ClassNames.DiffEditorLineNumber, ClassNames.DiffEditorLineNumberInsertion)
+const diffEditorLineNumberMetaClassName = mergeClassNames(ClassNames.DiffEditorLineNumber, ClassNames.DiffEditorLineNumberMeta)
+
 export const getLineNumberClassName = (type: LineNumberType = VisibleLineType.Normal): string => {
   if (type === VisibleLineType.Removed || type === InlineDiffRowType.Deletion) {
-    return mergeClassNames(ClassNames.DiffEditorLineNumber, ClassNames.DiffEditorLineNumberDeletion)
+    return diffEditorLineNumberDeletionClassName
   }
   if (type === VisibleLineType.Added || type === InlineDiffRowType.Insertion) {
-    return mergeClassNames(ClassNames.DiffEditorLineNumber, ClassNames.DiffEditorLineNumberInsertion)
+    return diffEditorLineNumberInsertionClassName
   }
   if (type === InlineDiffRowType.GitButtons || type === InlineDiffRowType.IncomingChange) {
-    return mergeClassNames(ClassNames.DiffEditorLineNumber, ClassNames.DiffEditorLineNumberMeta)
+    return diffEditorLineNumberMetaClassName
   }
   return ClassNames.DiffEditorLineNumber
 }

packages/diff-view/src/parts/GetVisibleLinesDom/GetLineDom/GetLineDom.ts

@@ -6,10 +6,12 @@ import { mergeClassNames } from '../../MergeClassNames/MergeClassNames.ts'
 import { getRowClassName } from '../GetRowClassName/GetRowClassName.ts'
 import { getTokenDom } from '../GetTokenDom/GetTokenDom.ts'
 
+const lineMissingClassName = mergeClassNames(ClassNames.EditorRow, ClassNames.DiffEditorLineMissing)
+
 export const getLineDom = (line: VisibleLine): readonly VirtualDomNode[] => {
   const children = line.tokens.length === 0 ? [text('')] : line.tokens.flatMap(getTokenDom)
   const childCount = line.tokens.length === 0 ? 1 : line.tokens.length
-  const className = line.lineNumber === -1 ? mergeClassNames(ClassNames.EditorRow, ClassNames.DiffEditorLineMissing) : getRowClassName(line.type)
+  const className = line.lineNumber === -1 ? lineMissingClassName : getRowClassName(line.type)
   return [
     {
       childCount,

packages/diff-view/src/parts/GetWhitespaceToggleDom/GetWhitespaceToggleDom.ts

@@ -11,11 +11,11 @@ const getLabel = (showWhitespace: boolean): string => {
   return showWhitespace ? DiffStrings.hideWhitespace() : DiffStrings.showWhitespace()
 }
 
+const activeWhitespaceToggleClassName = mergeClassNames(ClassNames.DiffEditorWhitespaceToggle, ClassNames.DiffEditorWhitespaceToggleActive)
+
 export const getWhitespaceToggleDom = (showWhitespace: boolean): readonly VirtualDomNode[] => {
   const label = getLabel(showWhitespace)
-  const className = showWhitespace
-    ? mergeClassNames(ClassNames.DiffEditorWhitespaceToggle, ClassNames.DiffEditorWhitespaceToggleActive)
-    : ClassNames.DiffEditorWhitespaceToggle
+  const className = showWhitespace ? activeWhitespaceToggleClassName : ClassNames.DiffEditorWhitespaceToggle
   return [
     {
       childCount: 1,

packages/e2e/src/diff.edit-right-side.ts

@@ -12,12 +12,13 @@ export const test: Test = async ({ Command, DiffView, expect, FileSystem, Locato
   await DiffView.open(`${tmpDir}/before.txt`, `${tmpDir}/after.txt`)
 
   const afterRows = Locator('.DiffEditorContentRight .DiffEditorRows')
+  const afterRow = afterRows.locator('.EditorRow').first()
   const input = Locator('.DiffEditorInput')
 
   await expect(input).toHaveCount(1)
   await Command.execute('DiffView.handleInput', 'gamma ')
 
   await expect(input).toHaveValue('gamma ')
   await expect(afterRows).toHaveText('gamma beta')
-  await expect(afterRows.locator('.EditorRow').first()).toHaveClass('EditorRow Insertion')
+  await expect(afterRow).toHaveClass('EditorRow Insertion')
 }

packages/e2e/src/diff.empty-after-pane-isolation.ts

@@ -15,8 +15,10 @@ export const test: Test = async ({ DiffView, expect, FileSystem, Locator, Worksp
   const beforePane = Locator('.DiffEditorContentLeft .DiffEditorRows')
   const afterPane = Locator('.DiffEditorContentRight .DiffEditorRows')
   const afterRows = Locator('.DiffEditorContentRight .DiffEditorRows')
+  const deletionRow = beforePane.locator('..EditorRow.Deletion')
+  const insertionRow = afterPane.locator('.DiffRow.Insertion')
 
-  await expect(beforePane.locator('..EditorRow.Deletion')).toHaveCount(1)
+  await expect(deletionRow).toHaveCount(1)
   await expect(afterRows).toHaveText('')
-  await expect(afterPane.locator('.DiffRow.Insertion')).toHaveCount(0)
+  await expect(insertionRow).toHaveCount(0)
 }

packages/e2e/src/diff.empty-before-pane-isolation.ts

@@ -15,8 +15,10 @@ export const test: Test = async ({ DiffView, expect, FileSystem, Locator, Worksp
   const beforePane = Locator('.DiffEditorContentLeft .DiffEditorRows')
   const afterPane = Locator('.DiffEditorContentRight .DiffEditorRows')
   const beforeRows = Locator('.DiffEditorContentLeft .DiffEditorRows')
+  const deletionRow = beforePane.locator('..EditorRow.Deletion')
+  const insertionRow = afterPane.locator('.DiffRow.Insertion')
 
   await expect(beforeRows).toHaveText('')
-  await expect(beforePane.locator('..EditorRow.Deletion')).toHaveCount(0)
-  await expect(afterPane.locator('.DiffRow.Insertion')).toHaveCount(1)
+  await expect(deletionRow).toHaveCount(0)
+  await expect(insertionRow).toHaveCount(1)
 }

packages/e2e/src/diff.rust-files.ts

@@ -26,11 +26,13 @@ export const test: Test = async ({ DiffView, expect, FileSystem, Locator, Worksp
 
   const beforePane = Locator('.DiffEditorContentLeft .DiffEditorRows')
   const afterPane = Locator('.DiffEditorContentRight .DiffEditorRows')
+  const beforeKeywords = beforePane.locator('.Token.Keyword')
+  const afterKeywords = afterPane.locator('.Token.Keyword')
 
   await expect(beforePane).toContainText('pub fn greet() {')
   await expect(beforePane).toContainText('let message = "hello";')
   await expect(afterPane).toContainText('pub fn greet() {')
   await expect(afterPane).toContainText('let message = "hello, world";')
-  await expect(beforePane.locator('.Token.Keyword')).toHaveCount(3)
-  await expect(afterPane.locator('.Token.Keyword')).toHaveCount(3)
+  await expect(beforeKeywords).toHaveCount(3)
+  await expect(afterKeywords).toHaveCount(3)
 }

packages/e2e/src/diff.syntax-highlighting-html.ts

@@ -32,10 +32,11 @@ export const test: Test = async ({ DiffView, expect, FileSystem, Locator, Worksp
 
   const beforePane = Locator('.DiffEditorContentLeft .DiffEditorRows')
   const afterPane = Locator('.DiffEditorContentRight .DiffEditorRows')
+  const beforeTagNames = beforePane.locator('.Token.TagName')
 
   await expect(beforePane).toContainText('<html lang="en">')
   await expect(afterPane).toContainText('<html lang="en">')
   await expect(beforePane).toContainText('<h1>Left</h1>')
   await expect(afterPane).toContainText('<h1>Right</h1>')
-  await expect(beforePane.locator('.Token.TagName')).toHaveCount(9)
+  await expect(beforeTagNames).toHaveCount(9)
 }

packages/e2e/src/diff.syntax-highlighting-java.ts

@@ -35,11 +35,13 @@ export const test: Test = async ({ DiffView, expect, FileSystem, Locator, Worksp
 
   const beforePane = Locator('.DiffEditorContentLeft .DiffEditorRows')
   const afterPane = Locator('.DiffEditorContentRight .DiffEditorRows')
+  const beforeKeywords = beforePane.locator('.Token.Keyword')
+  const afterKeywords = afterPane.locator('.Token.Keyword')
 
   await expect(beforePane).toContainText('int count = 1;')
   await expect(afterPane).toContainText('int count = 2;')
   await expect(beforePane).toContainText('return;')
   await expect(afterPane).toContainText('return;')
-  await expect(beforePane.locator('.Token.Keyword')).toHaveCount(5)
-  await expect(afterPane.locator('.Token.Keyword')).toHaveCount(5)
+  await expect(beforeKeywords).toHaveCount(5)
+  await expect(afterKeywords).toHaveCount(5)
 }

packages/e2e/src/diff.syntax-highlighting-tsx-react.ts

@@ -69,17 +69,23 @@ export function Card(${openBrace} title, description }: CardProps): ReactNode {
 
   const beforePane = Locator('.DiffEditorContentLeft .DiffEditorRows')
   const afterPane = Locator('.DiffEditorContentRight .DiffEditorRows')
+  const beforeKeywordImports = beforePane.locator('.Token.KeywordImport')
+  const afterKeywordImports = afterPane.locator('.Token.KeywordImport')
+  const beforeKeywordFunctions = beforePane.locator('.Token.KeywordFunction')
+  const afterKeywordFunctions = afterPane.locator('.Token.KeywordFunction')
+  const beforeStrings = beforePane.locator('.Token.String')
+  const afterStrings = afterPane.locator('.Token.String')
 
   await expect(beforePane).toContainText('readonly subtitle: string')
   await expect(afterPane).toContainText('readonly description: string')
   await expect(beforePane).toContainText('className="card"')
   await expect(afterPane).toContainText('className="card card--selected"')
   await expect(beforePane).toContainText("{isOpen ? 'Collapse' : 'Expand'}")
   await expect(afterPane).toContainText("{isOpen ? 'Collapse' : 'Open'}")
-  await expect(beforePane.locator('.Token.KeywordImport')).toHaveCount(3)
-  await expect(afterPane.locator('.Token.KeywordImport')).toHaveCount(3)
-  await expect(beforePane.locator('.Token.KeywordFunction')).toHaveCount(0)
-  await expect(afterPane.locator('.Token.KeywordFunction')).toHaveCount(0)
-  await expect(beforePane.locator('.Token.String')).toHaveCount(5)
-  await expect(afterPane.locator('.Token.String')).toHaveCount(5)
+  await expect(beforeKeywordImports).toHaveCount(3)
+  await expect(afterKeywordImports).toHaveCount(3)
+  await expect(beforeKeywordFunctions).toHaveCount(0)
+  await expect(afterKeywordFunctions).toHaveCount(0)
+  await expect(beforeStrings).toHaveCount(5)
+  await expect(afterStrings).toHaveCount(5)
 }

packages/e2e/src/viewlet.diff-editor-scrolling.ts

@@ -1,19 +1,5 @@
 import type { Test } from '@lvce-editor/test-with-playwright'
 
-const waitFor = async (assertion: () => Promise<void>): Promise<void> => {
-  let lastError: unknown
-  for (let attempt = 0; attempt < 20; attempt++) {
-    try {
-      await assertion()
-      return
-    } catch (error) {
-      lastError = error
-      await new Promise((resolve) => setTimeout(resolve, 50))
-    }
-  }
-  throw lastError
-}
-
 const getLargeFileContent = (bottomLine: string): string => {
   const lines: string[] = []
   for (let index = 1; index <= 1800; index++) {
@@ -48,5 +34,5 @@ export const test: Test = async ({ DiffView, expect, FileSystem, Locator, Worksp
   const line1800 = Locator('.DiffEditorContentLeft .DiffEditorLineNumber', {
     hasText: '1800',
   })
-  await waitFor(() => expect(line1800).toBeVisible())
+  await expect(line1800).toBeVisible()
 }

packages/e2e/src/viewlet.diff-editor-typing-at-cursor.ts

@@ -1,19 +1,5 @@
 import type { Test } from '@lvce-editor/test-with-playwright'
 
-const waitFor = async (assertion: () => Promise<void>): Promise<void> => {
-  let lastError: unknown
-  for (let attempt = 0; attempt < 20; attempt++) {
-    try {
-      await assertion()
-      return
-    } catch (error) {
-      lastError = error
-      await new Promise((resolve) => setTimeout(resolve, 50))
-    }
-  }
-  throw lastError
-}
-
 export const name = 'viewlet.diff-editor-typing-at-cursor'
 export const test: Test = async ({ DiffView, expect, FileSystem, Locator, Workspace }) => {
   const tmpDir = await FileSystem.getTmpDir()
@@ -34,8 +20,6 @@ export const test: Test = async ({ DiffView, expect, FileSystem, Locator, Worksp
   await input.type(' abc')
 
   await expect(input).toHaveValue(' abc')
-  await waitFor(async () => {
-    await expect(afterRows).toHaveText('helloWorld abc')
-    await expect(cursor).toHaveCSS('left', '175px')
-  })
+  await expect(afterRows).toHaveText('helloWorld abc')
+  await expect(cursor).toHaveCSS('left', '175px')
 }