You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by GitBox <gi...@apache.org> on 2022/09/06 15:07:17 UTC

[GitHub] [daffodil-vscode] stevedlawrence commented on a diff in pull request #245: omega-edit updates

stevedlawrence commented on code in PR #245:
URL: https://github.com/apache/daffodil-vscode/pull/245#discussion_r963818261


##########
src/omega_edit/omega_edit.js:
##########
@@ -132,29 +155,15 @@ function setupViewport(viewportId) {
       }
       insertByte('clipboard', viewportElement.selectionStart, 0)
     } else if ((event.ctrlKey || event.metaKey) && keyLower === 'z') {
-      var lastChangeElement = document.getElementById('lastChange')
-      var changeCount = document.getElementById('changeCount').value
-
-      if (lastChangeElement.value === '') {
-        return
-      }
-
       if (event.shiftKey) {

Review Comment:
   So is this Ctrl+Shift+Z is redo? Isn't the standard usually Ctrl+Y?



##########
package.json:
##########
@@ -47,7 +47,7 @@
     "google-protobuf": "3.20.1",
     "hexy": "0.3.4",
     "moo": "0.5.1",
-    "omega-edit": "0.9.8",
+    "omega-edit": "0.9.20",

Review Comment:
   Were any dependencies changed to omega edit that need to be included in the `build/package/{LICENSE,NOTICE}` files? 



##########
src/omega_edit/omega_edit.js:
##########
@@ -132,29 +155,15 @@ function setupViewport(viewportId) {
       }
       insertByte('clipboard', viewportElement.selectionStart, 0)
     } else if ((event.ctrlKey || event.metaKey) && keyLower === 'z') {

Review Comment:
   Isn't metaKey the Alt key? Why have both Ctrl+Z and Alt+Z undo?



##########
src/omega_edit/client.ts:
##########
@@ -93,56 +93,52 @@ export function activate(ctx: vscode.ExtensionContext) {
         filePath: fileToEdit,
       })
 
+      let fileSize = await omegaEditSession.getComputedFileSize(s)
+
       let vpAll = await omegaEditViewport.createViewport(
-        randomId().toString(),
-        s,
-        0,
-        1000
-      )
-      let vp1 = await omegaEditViewport.createViewport(
-        randomId().toString(),
+        '',
         s,
         0,
-        64
-      )
-      let vp2 = await omegaEditViewport.createViewport(
-        randomId().toString(),
-        s,
-        64,
-        64
-      )
-      let vp3 = await omegaEditViewport.createViewport(
-        randomId().toString(),
-        s,
-        128,
-        64
+        fileSize,
+        false
       )
 
+      // let data = await omegaEditViewport.getViewportData(vpAll)
+      let vp1 = await omegaEditViewport.createViewport('', s, 0, 64, false)
+      let vp2 = await omegaEditViewport.createViewport('', s, 64, 64, false)
+      let vp3 = await omegaEditViewport.createViewport('', s, 128, 64, false)
+
       await viewportSubscribe(panel, vpAll, vpAll, 'vpAll', 'hexAll')
       await viewportSubscribe(panel, vpAll, vp1, 'viewport1', null)
       await viewportSubscribe(panel, vpAll, vp2, 'viewport2', null)
       await viewportSubscribe(panel, vpAll, vp3, 'viewport3', null)
 
       panel.webview.onDidReceiveMessage(
         async (message) => {
-          if (message.command === 'printChangeCount') {
-            vscode.window.showInformationMessage(message.changeCount)
-            return
-          }
           var omegaEdit = new OmegaEdit(
             s,
             message.offset,
-            message.command === 'overwriteByte'
-              ? `${message.deleteValue},${message.addValue}`
-              : message.data,
+            message.data,
             message.len,
             panel
           )
+
+          var fileSize = await omegaEditSession.getComputedFileSize(s)
+          var searchPattern = message.searchPattern ? message.searchPattern : ''
+
+          if (searchPattern !== '' && fileSize < searchPattern.length) {
+            throw new Error("Search pattern can't be larger than file")
+          }

Review Comment:
   This check seems a little odd to me. Why check this specifically instead of just getting what I assume would be a "pattern not found" message?



##########
src/omega_edit/omega_edit.js:
##########
@@ -88,6 +85,32 @@ function saveSession() {
   })
 }
 
+function replace(data, offset, len) {
+  vscode.postMessage({
+    command: 'replace',
+    data: data,
+    offset: offset,
+    len: len,
+  })
+}
+
+function searchSession(searchPattern, caseInsensitive) {

Review Comment:
   Why the `Session` suffix. Can this just be `search`?



##########
src/omega_edit/client.ts:
##########
@@ -93,56 +93,52 @@ export function activate(ctx: vscode.ExtensionContext) {
         filePath: fileToEdit,
       })
 
+      let fileSize = await omegaEditSession.getComputedFileSize(s)
+
       let vpAll = await omegaEditViewport.createViewport(
-        randomId().toString(),
-        s,
-        0,
-        1000
-      )
-      let vp1 = await omegaEditViewport.createViewport(
-        randomId().toString(),
+        '',
         s,
         0,
-        64
-      )
-      let vp2 = await omegaEditViewport.createViewport(
-        randomId().toString(),
-        s,
-        64,
-        64
-      )
-      let vp3 = await omegaEditViewport.createViewport(
-        randomId().toString(),
-        s,
-        128,
-        64
+        fileSize,
+        false
       )
 
+      // let data = await omegaEditViewport.getViewportData(vpAll)

Review Comment:
   Remove commented code



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@daffodil.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org