microsoft · vishwacsena · Nov 27, 2019 · Nov 22, 2019 · Nov 25, 2019 · Nov 26, 2019
diff --git a/packages/lu/src/parser/luis/luConverter.js b/packages/lu/src/parser/luis/luConverter.js
@@ -58,9 +58,12 @@ const parseIntentsToLu = function(luisObj, luisJSON){
        fileContent += parseUtterancesToLu(intent.utterances, luisJSON)
        fileContent += NEWLINE + NEWLINE;
        if (intent.intent.features) {
-            fileContent += `@ intent ${intent.intent.name}`;
-            fileContent += addRolesAndFeatures(intent.intent);
-            fileContent += NEWLINE + NEWLINE;
+            let rolesAndFeatures = addRolesAndFeatures(intent.intent);
+            if (rolesAndFeatures !== '') {
+                fileContent += `@ intent ${intent.intent.name}`;
+                fileContent += rolesAndFeatures;
+                fileContent += NEWLINE + NEWLINE;
+            }
        }
    });
    return fileContent

diff --git a/packages/lu/test/commands/luis/convert.test.ts b/packages/lu/test/commands/luis/convert.test.ts
@@ -467,9 +467,16 @@ describe('luis:convert version 5 upgrade test', () => {

  test
  .stdout()
-  .command(['luis:convert', '--in', `${path.join(__dirname, './../../fixtures/testcases/v6WithoutPhraseLists.lu')}`, '--out', './results/root45.json'])
+  .command(['luis:convert', '--in', `${path.join(__dirname, './../../fixtures/testcases/emptyIntentDescriptors.json')}`, '--out', './results/root40.lu'])
+  .it('luis:convert successfully converts LUIS JSON model with empty intent feature descriptors', async () => {
+    expect(await compareLuFiles('./../../../results/root40.lu', './../../fixtures/verified/emptyIntentDescriptors.lu')).to.be.true
+  })
+
+  test
+  .stdout()
+  .command(['luis:convert', '--in', `${path.join(__dirname, './../../fixtures/testcases/v6WithoutPhraseLists.lu')}`, '--out', './results/root38.json'])
  .it('luis:convert successfully converts LUIS JSON model with no phrase lists (output must have phraselists if any v6 concepts are present in the .lu file)', async () => {
-    expect(await compareLuFiles('./../../../results/root45.json', './../../fixtures/verified/v6WithoutPhraseLists.json')).to.be.true
+    expect(await compareLuFiles('./../../../results/root38.json', './../../fixtures/verified/v6WithoutPhraseLists.json')).to.be.true
  })

  test

diff --git a/packages/lu/test/fixtures/testcases/emptyIntentDescriptors.json b/packages/lu/test/fixtures/testcases/emptyIntentDescriptors.json
@@ -0,0 +1,87 @@
+{
+  "luis_schema_version": "6.0.0",
+  "intents": [
+    {
+      "name": "None",
+      "features": []
+    },
+    {
+      "name": "test",
+      "features": []
+    }
+  ],
+  "entities": [
+    {
+      "name": "address",
+      "children": [
+        {
+          "name": "doorNumber",
+          "instanceOf": "number",
+          "children": [],
+          "features": []
+        },
+        {
+          "name": "streetName",
+          "children": [],
+          "features": []
+        },
+        {
+          "name": "city",
+          "instanceOf": "geographyV2",
+          "children": [],
+          "features": []
+        },
+        {
+          "name": "zipcode",
+          "instanceOf": "zipRegex",
+          "children": [],
+          "features": []
+        }
+      ],
+      "roles": [],
+      "features": []
+    }
+  ],
+  "hierarchicals": [],
+  "composites": [],
+  "closedLists": [],
+  "prebuiltEntities": [
+    {
+      "name": "geographyV2",
+      "roles": []
+    },
+    {
+      "name": "number",
+      "roles": []
+    }
+  ],
+  "utterances": [
+    {
+      "text": "one",
+      "intent": "test",
+      "entities": []
+    },
+    {
+      "text": "two",
+      "intent": "test",
+      "entities": []
+    }
+  ],
+  "versionId": "0.1",
+  "name": "Json 6.0.0 Full Appaaaaaaaaaa",
+  "desc": "test",
+  "culture": "en-us",
+  "tokenizerVersion": "1.0.0",
+  "patternAnyEntities": [],
+  "regex_entities": [
+    {
+      "name": "zipRegex",
+      "regexPattern": "[0-9]{5}",
+      "roles": []
+    }
+  ],
+  "phraselists": [],
+  "regex_features": [],
+  "patterns": [],
+  "settings": []
+}
diff --git a/packages/lu/test/fixtures/verified/emptyIntentDescriptors.lu b/packages/lu/test/fixtures/verified/emptyIntentDescriptors.lu
@@ -0,0 +1,45 @@
+
+> LUIS application information
+> !# @app.name = Json 6.0.0 Full Appaaaaaaaaaa
+> !# @app.desc = test
+> !# @app.versionId = 0.1
+> !# @app.culture = en-us
+> !# @app.luis_schema_version = 6.0.0
+
+
+> # Intent definitions
+
+## None
+
+
+## test
+- one
+- two
+
+
+> # Entity definitions
+
+@ ml address
+    - @ number doorNumber
+    - @ ml streetName
+    - @ geographyV2 city
+    - @ zipRegex zipcode
+
+
+
+> # PREBUILT Entity definitions
+
+@ prebuilt geographyV2
+
+@ prebuilt number
+
+
+> # Phrase list definitions
+
+
+> # List entities
+
+> # RegEx entities
+
+@ regex zipRegex = /[0-9]{5}/
+