You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by sh...@apache.org on 2022/08/06 01:07:54 UTC

[daffodil-vscode] branch main updated: 1.1.0-rc1 Updates:

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

shanedell pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-vscode.git


The following commit(s) were added to refs/heads/main by this push:
     new 05b1322  1.1.0-rc1 Updates:
05b1322 is described below

commit 05b1322c0a39975d3ec81db609e301c4a18f903d
Author: Shane Dell <sh...@gmail.com>
AuthorDate: Tue Aug 2 13:40:54 2022 -0400

    1.1.0-rc1 Updates:
    
    - Fix filename typo for DFDLGeneralFormat
    - Add needed language file to extension package
      - This being missing is what caused the launch wizard along with other things to break
    - Remove the root .vscodeignore as it is no longer needed
    
    Closes #246
    Closes #247
---
 .vscodeignore                                      | 31 ----------------------
 build/package/.vscodeignore                        |  1 +
 src/language/dfdl.ts                               |  2 +-
 ...Format.dfdl.xsdf => DFDLGeneralFormat.dfdl.xsd} |  0
 4 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/.vscodeignore b/.vscodeignore
deleted file mode 100644
index a0dfa9e..0000000
--- a/.vscodeignore
+++ /dev/null
@@ -1,31 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*
-*/**
-!dist/ext/extension.js
-!images/*
-!LICENSE
-!NOTICE
-!package.json
-!README.md
-!server/core/target/universal/daffodil-debugger-*.zip
-!language/*
-!language/syntaxes/*
-!src/launchWizard/launchWizard.js
-!src/styles/styles.css
-!src/omega_edit/omega_edit.js
-!src/omega_edit/interface.html
-!src/omega_edit/omega-edit-scala-server*.zip
diff --git a/build/package/.vscodeignore b/build/package/.vscodeignore
index a0dfa9e..64bafdb 100644
--- a/build/package/.vscodeignore
+++ b/build/package/.vscodeignore
@@ -29,3 +29,4 @@
 !src/omega_edit/omega_edit.js
 !src/omega_edit/interface.html
 !src/omega_edit/omega-edit-scala-server*.zip
+!src/language/providers/intellisense/DFDLGeneralFormat.dfdl.xsd
diff --git a/src/language/dfdl.ts b/src/language/dfdl.ts
index d58cfd7..a52d682 100644
--- a/src/language/dfdl.ts
+++ b/src/language/dfdl.ts
@@ -27,7 +27,7 @@ export function activate(context: vscode.ExtensionContext) {
   let dfdlFormat = fs
     .readFileSync(
       context.asAbsolutePath(
-        './src/language/providers/intellisense/DFDLGeneralFormat.dfdl.xsdf'
+        './src/language/providers/intellisense/DFDLGeneralFormat.dfdl.xsd'
       )
     )
     .toLocaleString()
diff --git a/src/language/providers/intellisense/DFDLGeneralFormat.dfdl.xsdf b/src/language/providers/intellisense/DFDLGeneralFormat.dfdl.xsd
similarity index 100%
rename from src/language/providers/intellisense/DFDLGeneralFormat.dfdl.xsdf
rename to src/language/providers/intellisense/DFDLGeneralFormat.dfdl.xsd