Fix to normalize the names in lgUtil

microsoft · Apr 19, 2021 · 58a9277 · 58a9277
1 parent 7077369
commit 58a9277
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Composer/packages/lib/indexers/src/utils/lgUtil.ts b/Composer/packages/lib/indexers/src/utils/lgUtil.ts
@@ -17,6 +17,7 @@ import {
   Range,
   LgFile,
   DiagnosticSeverity,
+  LgTemplateRef,
 } from '@bfc/shared';
 import formatMessage from 'format-message';
 import isEmpty from 'lodash/isEmpty';
@@ -238,7 +239,15 @@ export function removeTemplates(
 ): LgFile {
   const { id } = lgFile;
   let resource = getLgResource(lgFile, importResolver);
-  templateNames.forEach((templateName) => {
+
+  const normalizedLgTemplates = templateNames
+    .map((x) => {
+      const lgTemplateRef = LgTemplateRef.parse(x);
+      return lgTemplateRef ? lgTemplateRef.name : x;
+    })
+    .filter((x) => !!x);
+
+  normalizedLgTemplates.forEach((templateName) => {
     resource = resource.deleteTemplate(templateName);
   });
   return convertTemplatesToLgFile(id, resource.toString(), resource);