This is an automated email from the ASF dual-hosted git repository.

arosien pushed a commit to branch issue/680/daffodil-3.5.0
in repository https://gitbox.apache.org/repos/asf/daffodil-vscode.git

commit 0a52a663afabb66ca19cb7cdd737c1321bd259db
Merge: 30b74a9 43672e8
Author: Adam Rosien <[email protected]>
AuthorDate: Tue Aug 8 08:39:19 2023 -0700

    Merge remote-tracking branch 'upstream/main' into issue/680/daffodil-3.5.0

 .github/workflows/CI.yml                           |    6 +-
 .github/workflows/nightly.yml                      |    1 +
 .gitignore                                         |    2 +
 .prettierignore                                    |    7 +-
 .prettierrc                                        |    1 +
 .scalafmt.conf                                     |    2 +-
 LICENSE                                            |  229 ++-
 README.md                                          |    7 +-
 build.sbt                                          |   32 +-
 build/extension.webpack.config.js                  |   56 -
 build/package/LICENSE                              |  227 +++
 build/package/NONOTICE                             |    5 +
 build/scripts/package.ts                           |   93 -
 build/yarn-scripts.ts                              |  129 ++
 debugger/nodemon.json                              |   13 +
 .../src/main/resources/bindings.xjb                |    0
 .../src/main/resources/logback.xml                 |   12 +-
 .../Compiler.scala                                 |    0
 .../org.apache.daffodil.debugger.dap/DAPodil.scala |    2 +
 .../ErrorEvents.scala                              |    0
 .../org.apache.daffodil.debugger.dap/Next.scala    |    0
 .../org.apache.daffodil.debugger.dap/Parse.scala   |   65 +-
 .../org.apache.daffodil.debugger.dap/logging.scala |    0
 .../main/scala/org.apache.daffodil.tdml/TDML.scala |    0
 .../core => debugger}/src/templates/bash-template  |    0
 .../core => debugger}/src/templates/bat-template   |    0
 .../core => debugger}/src/test/data/emptyData.xml  |    0
 .../src/test/data/emptyInfoset.xml                 |    0
 .../src/test/data/emptySchema.dfdl.xsd             |    0
 .../core => debugger}/src/test/data/notInfoset.xml |    0
 .../org.apache.daffodil.debugger/ParseSuite.scala  |    8 +-
 .../scala/org.apache.daffodil.tdml/TDMLSuite.scala |   30 +-
 build/package/.vscodeignore => generate_file.py    |   40 +-
 package.json                                       |  219 +-
 project/Rat.scala                                  |   24 +-
 src/adapter/activateDaffodilDebug.ts               |  127 +-
 src/adapter/daffodilEvent.ts                       |    2 +-
 src/adapter/debugAdapter.ts                        |   75 -
 src/adapter/extension.ts                           |  151 +-
 src/classes/artifact.ts                            |   14 +-
 src/classes/dataEditor.ts                          |    5 +-
 src/classes/{dataEditor.ts => dfdlDebugger.ts}     |    8 +-
 src/classes/{dataEditor.ts => loggingConfig.ts}    |    7 +-
 .../commonItems.ts => classes/vscode-launch.ts}    |   36 +-
 src/daffodilDebugger.ts                            |  260 ---
 src/{ => daffodilDebugger}/daffodil.ts             |    1 +
 src/daffodilDebugger/debugger.ts                   |  196 ++
 .../dataEditor.ts => daffodilDebugger/index.ts}    |    8 +-
 .../utils.ts}                                      |   41 +-
 src/dataEdit/client.ts                             |  286 ---
 src/dataEdit/dataEditWebView.ts                    |  454 -----
 src/dataEdit/utils.ts                              |  241 ---
 src/dataEditor/dataEditorClient.ts                 | 1160 +++++++++++
 src/dataEditor/demos/demo-highlight_overlays.html  |  175 ++
 src/dataEditor/demos/demo-infinite_scrolling.html  |  344 ++++
 .../svelteWebviewInitializer.ts                    |    2 +-
 src/hexView.ts                                     |    7 +-
 src/infoset.ts                                     |    2 +-
 src/language/providers/attributeCompletion.ts      |  155 +-
 src/language/providers/closeElement.ts             |    4 +-
 src/language/providers/closeElementSlash.ts        |    4 +-
 src/language/providers/elementCompletion.ts        |  206 +-
 .../providers/intellisense/attributeItems.ts       |  320 ++-
 .../providers/intellisense/attributeValueItems.ts  |  120 +-
 src/language/providers/intellisense/commonItems.ts |    4 +-
 .../providers/intellisense/elementItems.ts         |   74 +-
 src/language/providers/utils.ts                    |   17 +-
 src/language/semantics/dfdlExt.ts                  |  278 +++
 src/language/semantics/documentChangeHandler.ts    |   59 +
 src/language/semantics/functionData.ts             |  560 +++++
 .../semantics/xPathDocumentChangeHandler.ts        |   79 +
 src/language/semantics/xpLexer.ts                  | 1724 ++++++++++++++++
 src/language/semantics/xslLexer.ts                 | 1614 +++++++++++++++
 src/language/semantics/xsltTokenDiagnostics.ts     | 2107 +++++++++++++++++++
 src/launchWizard/launchWizard.js                   |   65 +-
 src/launchWizard/launchWizard.ts                   |   46 +-
 src/styles/styles.css                              |    2 +-
 src/svelte/.prettierrc                             |    7 -
 src/svelte/package.json                            |   31 -
 src/svelte/rollup.config.js                        |   80 -
 .../DataDisplays/CustomByteDisplay/BinaryData.ts   |  257 +++
 .../CustomByteDisplay/DataLineFeed.svelte          |  658 ++++++
 .../CustomByteDisplay/DataValue.svelte             |  146 ++
 .../FileTraversalIndicator.svelte                  |   85 +
 .../CustomByteDisplay/SelectedByteEdit.svelte      |  444 ++++
 .../components/DataDisplays/DataViewports.svelte   |  115 ++
 .../DataDisplays/Fieldsets/ContentControls.svelte  |   54 +
 .../DataDisplays/Fieldsets/DataView.svelte         |  440 ++++
 .../DataDisplays/Header/DisplayHeader.svelte       |  197 ++
 .../DataMetrics/ByteFrequencyGraph.svelte          |  573 ++++++
 .../src/components/Editors/DataEditor.svelte       |   67 +
 src/svelte/src/components/Error/Error.svelte       |   38 +
 src/svelte/src/components/Error/Error.ts           |  113 ++
 src/svelte/src/components/Header/Header.svelte     |   99 +
 .../components/Header/fieldsets/FileMetrics.svelte |  240 +++
 .../src/components/Header/fieldsets/FileMetrics.ts |   33 +
 .../Header/fieldsets/SearchReplace.svelte          |  444 ++++
 .../components/Header/fieldsets/SearchReplace.ts   |  134 ++
 .../components/Header/fieldsets/Settings.svelte    |   87 +
 .../src/components/Inputs/Buttons/Button.svelte    |   96 +
 .../Inputs/Buttons/ConfigurationToggle.svelte      |   60 +
 .../Inputs/Buttons/ToggleableButton.svelte         |   55 +
 .../src/components/Inputs/Input/Input.svelte       |  194 ++
 .../src/components/Inputs/Input/RadioEdit.svelte   |   80 +
 src/svelte/src/components/Main.svelte              |   36 +
 .../components/ServerMetrics/ServerMetrics.svelte  |  138 ++
 src/svelte/src/components/dataEditor.svelte        | 2138 ++------------------
 src/svelte/src/components/globalStyles.css         |  481 +++++
 .../src/components/layouts/FlexContainer.svelte    |   36 +
 src/svelte/src/components/layouts/SidePanel.svelte |  124 ++
 src/svelte/src/components/layouts/Tooltip.svelte   |   80 +
 .../src/resources/fonts/RedHatMono-Regular.woff2   |  Bin 0 -> 20952 bytes
 .../resources/fonts/SpaceGrotesk-Variable.woff2    |  Bin 0 -> 49256 bytes
 .../src/resources/icons/material-icons.woff2       |  Bin 0 -> 690760 bytes
 src/svelte/src/stores/configuration.ts             |  119 ++
 src/svelte/src/stores/index.ts                     |  676 ++++---
 src/svelte/src/stores/localStore.ts                |   44 +-
 src/svelte/src/utilities/display.ts                |  402 ++--
 .../svelte/src/utilities/enterKeypressEvents.ts    |   38 +-
 src/svelte/src/utilities/highlights.ts             |   68 +
 src/svelte/src/utilities/message.ts                |   37 +-
 src/svelte/src/utilities/vscode.ts                 |    2 +-
 src/svelte/tsconfig.json                           |   15 +-
 src/svelte/webpack.config.js                       |  116 ++
 src/svelte/yarn.lock                               |  705 -------
 src/tests/suite/adapter.test.ts                    |   96 -
 src/tests/suite/daffodil.test.ts                   |    6 +-
 src/tests/suite/daffodilDebugger.test.ts           |  113 +-
 src/tests/suite/dataEditor.test.ts                 |   90 +-
 src/tests/suite/language/items.test.ts             |   52 +-
 src/tests/suite/utils.test.ts                      |   27 +-
 src/tests/suite/version.test.ts                    |    7 +-
 src/utils.ts                                       |  170 +-
 tsconfig.json                                      |    6 +-
 webpack/ext-dev.webpack.config.js                  |  105 +
 webpack/ext-package.webpack.config.js              |  157 ++
 yarn.lock                                          | 1963 +++++++++++++-----
 137 files changed, 18830 insertions(+), 6294 deletions(-)

diff --cc debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
index b1abaff,8703f32..4ce7358
--- a/debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
+++ b/debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala
@@@ -32,10 -32,9 +32,9 @@@ import java.io.
  import java.net.URI
  import java.nio.file._
  import org.apache.commons.io.FileUtils
- import org.apache.daffodil.lib.api.Diagnostic
  import org.apache.daffodil.debugger.dap.{BuildInfo => DAPBuildInfo}
 -import org.apache.daffodil.debugger.Debugger
 -import org.apache.daffodil.exceptions.SchemaFileLocation
 +import org.apache.daffodil.runtime1.debugger.Debugger
 +import org.apache.daffodil.lib.exceptions.SchemaFileLocation
  import org.apache.daffodil.infoset._
  import org.apache.daffodil.processors.dfa.DFADelimiter
  import org.apache.daffodil.processors.parsers._

Reply via email to