Convert gallery flags to the expected format

It does not seem to affect much other than making VS Code properly
display a "preview" tag for extensions that are in preview mode,
although maybe there are other consequences.

Author: code-asher

storage/storage.go

@@ -271,7 +271,21 @@ func parseVSIXManifest(reader io.Reader) (*VSIXManifest, error) {
 	if err != nil {
 		return nil, err
 	}
-	return vm, validateManifest(vm)
+	err = validateManifest(vm)
+	if err != nil {
+		return vm, err
+	}
+	// The manifest stores these as capitalized space-delimited strings but we
+	// want to present them as lowercased comma-separated strings to VS Code.
+	// For example, "Public Preview" becomes "public, preview".  Make sure to
+	// handle the case where they are already comma-separated, just in case.
+	flags := strings.Fields(vm.Metadata.GalleryFlags)
+	converted := make([]string, len(flags))
+	for i, flag := range flags {
+		converted[i] = strings.ToLower(strings.TrimRight(flag, ","))
+	}
+	vm.Metadata.GalleryFlags = strings.Join(converted, ", ")
+	return vm, nil
 }
 
 // validateManifest checks a manifest for issues.

storage/storage_test.go

@@ -585,6 +585,9 @@ func TestReadVSIXManifest(t *testing.T) {
 	tests := []struct {
 		// error is the expected error, if any.
 		error string
+		// expected is the expected manifest.  If not provided, check against
+		// `manifest` instead.
+		expected *storage.VSIXManifest
 		// manifest is the manifest from which to create the VSIX.  Use `vsix` to
 		// specify raw bytes instead.
 		manifest *storage.VSIXManifest
@@ -607,6 +610,78 @@ func TestReadVSIXManifest(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "SpaceSeparatedFlags",
+			manifest: &storage.VSIXManifest{
+				Metadata: storage.VSIXMetadata{
+					Identity: storage.VSIXIdentity{
+						Publisher: "foo",
+						ID:        "bar",
+						Version:   "baz",
+					},
+					GalleryFlags: "Public Preview",
+				},
+			},
+			expected: &storage.VSIXManifest{
+				Metadata: storage.VSIXMetadata{
+					Identity: storage.VSIXIdentity{
+						Publisher: "foo",
+						ID:        "bar",
+						Version:   "baz",
+					},
+					GalleryFlags: "public, preview",
+				},
+			},
+		},
+		{
+			name: "CommaSpaceSeparatedFlags",
+			manifest: &storage.VSIXManifest{
+				Metadata: storage.VSIXMetadata{
+					Identity: storage.VSIXIdentity{
+						Publisher: "foo",
+						ID:        "bar",
+						Version:   "baz",
+					},
+					GalleryFlags: "public, preview",
+				},
+			},
+		},
+		{
+			name: "CommaSpaceSpaceSeparatedFlags",
+			manifest: &storage.VSIXManifest{
+				Metadata: storage.VSIXMetadata{
+					Identity: storage.VSIXIdentity{
+						Publisher: "foo",
+						ID:        "bar",
+						Version:   "baz",
+					},
+					GalleryFlags: "public,  preview",
+				},
+			},
+			expected: &storage.VSIXManifest{
+				Metadata: storage.VSIXMetadata{
+					Identity: storage.VSIXIdentity{
+						Publisher: "foo",
+						ID:        "bar",
+						Version:   "baz",
+					},
+					GalleryFlags: "public, preview",
+				},
+			},
+		},
+		{
+			name: "CommaSeparatedFlags",
+			manifest: &storage.VSIXManifest{
+				Metadata: storage.VSIXMetadata{
+					Identity: storage.VSIXIdentity{
+						Publisher: "foo",
+						ID:        "bar",
+						Version:   "baz",
+					},
+					GalleryFlags: "public,preview",
+				},
+			},
+		},
 		{
 			name:  "MissingManifest",
 			error: "not found",
@@ -670,8 +745,12 @@ func TestReadVSIXManifest(t *testing.T) {
 				require.Error(t, err)
 				require.Regexp(t, test.error, err.Error())
 			} else {
+				expected := test.expected
+				if expected == nil {
+					expected = test.manifest
+				}
 				require.NoError(t, err)
-				require.Equal(t, test.manifest, manifest)
+				require.Equal(t, expected, manifest)
 			}
 		})
 	}