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

diff --git a/.vscodeignore b/.vscodeignore
deleted file mode 100644 (file)
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 a0dfa9e64d414b6c838420d2fe863ac6f199f26b..64bafdbebf40578d3c6912aefa06a526a4fd0a27 100644 (file)
--- 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 d58cfd7f869d1edbb4d2db91edcc0a9cafc23920..a52d6820f8b9e3e3886cd968fb0452948d83b5da 100644 (file)
--- 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