fixes a bug where a space or slash typed in quoted cause the text to be

removed fixes a bug where a typed '/' inserted '/>' fixes a bug where a space typed on a blank line trigger intellisense for the item in the line above modified hover behavoior to produce definitions for dfdl attributes only closes apache#1064
shanedell · Jul 19, 2024 · 9376305 · 9376305
1 parent 1329b4f
commit 9376305
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 9 deletions.
diff --git a/src/language/providers/attributeHover.ts b/src/language/providers/attributeHover.ts
@@ -17,6 +17,7 @@
 
 import * as vscode from 'vscode'
 import { attributeHoverValues } from './intellisense/attributeHoverItems'
+import { attributeCompletion } from './intellisense/attributeItems'
 
 export function getAttributeHoverProvider() {
   return vscode.languages.registerHoverProvider('dfdl', {
@@ -28,11 +29,17 @@ export function getAttributeHoverProvider() {
       const range = document.getWordRangeAtPosition(position)
       const word = document.getText(range)
 
+      let itemNames: string[] = []
+      attributeCompletion('', '', 'dfdl:', '', '').items.forEach((r) =>
+        itemNames.push(r.item)
+      )
       if (word.length > 0) {
-        return new vscode.Hover({
-          language: 'dfdl',
-          value: attributeHoverValues(word),
-        })
+        if (itemNames.includes(word)) {
+          return new vscode.Hover({
+            language: 'dfdl',
+            value: attributeHoverValues(word),
+          })
+        }
       }
     },
   })

diff --git a/src/language/providers/attributeValueCompletion.ts b/src/language/providers/attributeValueCompletion.ts
@@ -51,13 +51,19 @@ export function getAttributeValueCompletionProvider() {
             replaceValue = ' '
           }
 
-          if (attributeName.includes(':')) {
+          if (
+            attributeName.includes(':') &&
+            !attributeName.includes('xmlns:')
+          ) {
             attributeName = attributeName.substring(
               attributeName.indexOf(':') + 1
             )
           }
 
-          if (noChoiceAttributes.includes(attributeName)) {
+          if (
+            noChoiceAttributes.includes(attributeName) ||
+            attributeName.includes('xmlns:')
+          ) {
             return undefined
           }
 
@@ -75,7 +81,7 @@ export function getAttributeValueCompletionProvider() {
         return undefined
       },
     },
-    ' ' // triggered whenever a newline is typed
+    ' ' // triggered whenever a space is typed
   )
 }
 
@@ -130,7 +136,7 @@ export function getTDMLAttributeValueCompletionProvider() {
         return undefined
       },
     },
-    ' ' // triggered whenever a newline is typed
+    ' ' // triggered whenever a space is typed
   )
 }
 
@@ -182,6 +188,10 @@ function getAttributeDetails(
           currentPos < triggerPos &&
           textBeforeTrigger.lastIndexOf('=') === currentPos - 1
         ) {
+          textBeforeTrigger = textBeforeTrigger.substring(
+            0,
+            textBeforeTrigger.lastIndexOf('=')
+          )
           endPos = currentText.indexOf(quoteChar[i], currentPos + 1)
           attributeStartPos = textBeforeTrigger.lastIndexOf(' ')
           attributeName = textBeforeTrigger.substring(

diff --git a/src/language/providers/closeElementSlash.ts b/src/language/providers/closeElementSlash.ts
@@ -47,6 +47,9 @@ export function getCloseElementSlashProvider() {
           position,
           nsPrefix
         )
+        if (nearestTagNotClosed === 'none') {
+          return undefined
+        }
         const itemsOnLine = getItemsOnLineCount(triggerText)
 
         if (

diff --git a/src/language/providers/intellisense/attributeValueItems.ts b/src/language/providers/intellisense/attributeValueItems.ts
@@ -62,6 +62,9 @@ export const noChoiceAttributes = [
   'test',
   'testPattern',
   'message',
+  'source',
+  'schemaLocation',
+  'targetNamespace',
 ]
 
 export function attributeValues(

diff --git a/src/language/providers/utils.ts b/src/language/providers/utils.ts
@@ -207,10 +207,19 @@ export function checkTagOpen(
   const triggerPos = position.character
   const textBeforeTrigger = triggerText.substring(0, triggerPos)
 
-  while (itemsOnLine < 2 && !triggerText.trim().startsWith('<')) {
+  while (
+    itemsOnLine < 2 &&
+    !triggerText.trim().startsWith('<') &&
+    !triggerText.includes('/>') &&
+    !triggerText.includes('<')
+  ) {
     triggerText = document.lineAt(--triggerLine).text
   }
 
+  if (triggerText.includes('/>') || triggerText.includes('</')) {
+    return false
+  }
+
   if (!(triggerText.endsWith('>') && triggerText.includes('<'))) {
     isMultiLineTag = true
   }