fix: enable schema browser when diverged, and fix divergence detection with multiline deletion event. (#5870)

* fix: enable schema browsing while diverged

* fix: detected divergence when deleted lines produce an onChange event with range outside of current/new composition block size

* fix: because of counting in SchemaBrowser tests, need to only create 2nd bucket for SchemaComposition tests

Author: wiedld

cypress/e2e/shared/fluxQueryBuilder.test.ts

@@ -12,21 +12,21 @@ const DEFAULT_SCHEMA = {
 }
 
 describe('Script Builder', () => {
+  const writeData: string[] = []
+  for (let i = 0; i < 30; i++) {
+    writeData.push(`ndbc,air_temp_degc=70_degrees station_id_${i}=${i}`)
+  }
+
   beforeEach(() => {
     cy.flush().then(() => {
       cy.signin().then(() => {
-        cy.get('@org').then(({id}: Organization) => {
+        cy.get('@org').then(({id, name}: Organization) => {
           cy.visit(`/orgs/${id}/data-explorer`)
           cy.getByTestID('tree-nav').should('be.visible')
           cy.setFeatureFlags({
             newDataExplorer: true,
           }).then(() => {
-            const writeData = []
-            for (let i = 0; i < 30; i++) {
-              writeData.push(
-                `ndbc,air_temp_degc=70_degrees station_id_${i}=${i}`
-              )
-            }
+            cy.createBucket(id, name, 'defbuck2')
             cy.writeData(writeData, 'defbuck')
             cy.wait(100)
             cy.getByTestID('flux-query-builder-toggle').then($toggle => {
@@ -191,6 +191,8 @@ describe('Script Builder', () => {
       '// Start by selecting data from the schema browser or typing flux here'
 
     beforeEach(() => {
+      cy.writeData(writeData, 'defbuck2')
+
       window.sessionStorage.setItem(
         'dataExplorer.schema',
         JSON.parse(JSON.stringify(DEFAULT_SCHEMA))
@@ -277,6 +279,14 @@ describe('Script Builder', () => {
 
         cy.log('toggle is now disabled')
         cy.getByTestID('flux-sync--toggle').should('have.class', 'disabled')
+
+        cy.log('can still browse schema while diverged')
+        cy.getByTestID('bucket-selector--dropdown-button').click()
+        cy.getByTestID(`bucket-selector--dropdown--defbuck2`).click()
+        cy.getByTestID('bucket-selector--dropdown-button').should(
+          'contain',
+          'defbuck2'
+        )
       })
 
       it('should clear the editor text, and schema browser, with a new script', () => {

src/dataExplorer/context/persistance.tsx

@@ -132,7 +132,8 @@ export const PersistanceProvider: FC = ({children}) => {
 
   const setSchemaSelection = useCallback(
     schema => {
-      if (selection.composition?.diverged && schema.composition.synced) {
+      if (selection.composition?.diverged && schema.composition?.synced) {
+        // cannot re-sync if diverged
         return
       }
       const nextState: SchemaSelection = {

src/languageSupport/languages/flux/lsp/connection.ts

@@ -144,11 +144,25 @@ class LspConnectionManager {
       return false
     }
     const {startLine, endLine} = compositionBlock
-    return (
+
+    const changeInBlock =
       change.range.startLineNumber >= startLine &&
-      (change.range.endLineNumber <= endLine ||
-        change.text.includes(COMPOSITION_YIELD))
-    )
+      change.range.endLineNumber <= endLine
+
+    const changeWithCompositionIdentifier =
+      change.text.includes(COMPOSITION_YIELD)
+
+    const isDeletion = change.text == ''
+    let deletionFromBlock = false
+    if (isDeletion) {
+      const linesDeleted =
+        change.range.endLineNumber - change.range.startLineNumber
+      deletionFromBlock =
+        change.range.startLineNumber >= startLine &&
+        change.range.endLineNumber <= endLine + linesDeleted
+    }
+
+    return changeInBlock || changeWithCompositionIdentifier || deletionFromBlock
   }
 
   _setEditorIrreversibleExit() {