Preserve namespace

Author: timheuer

src/addNewResource.ts

@@ -54,7 +54,7 @@ export async function newResourceInput(context: ExtensionContext) {
 			totalSteps: 3,
 			value: state.comment || '',
 			prompt: AppConstants.promptCommentName,
-			validate: validateNotNull,
+			validate: () => Promise.resolve(undefined), // Allow empty comments
 			shouldResume: shouldResume
 		});
 	}

src/resxProvider.ts

@@ -126,6 +126,13 @@ export class ResxProvider implements vscode.CustomTextEditorProvider {
       const parsedJson = JSON.parse(json);
       const edit = new vscode.WorkspaceEdit();
 
+      // Filter out empty comments before converting to RESX
+      for (const key in parsedJson) {
+        if (parsedJson[key].comment === '') {
+          delete parsedJson[key].comment;
+        }
+      }
+
       // Update the RESX file
       const resxContent = await resx.js2resx(parsedJson);
       edit.replace(

src/utilities/constants.ts

@@ -4,7 +4,7 @@ export class AppConstants {
     static viewTypeId = 'resx-editor.editor';
     static promptKeyName = 'Provide a Key for the resource';
     static promptValueName = 'Provide a Value for the resource';
-    static promptCommentName = 'Provide a Comment for the resource';
+    static promptCommentName = 'Provide a Comment for the resource (optional)';
     static addNewTitle = 'Add new resource';
     static openInTextEditorCommand = 'resx-editor.openInTextEditor';
     static openPreviewCommand = 'resx-editor.openPreview';

src/utilities/designerGenerator.ts

@@ -1,8 +1,9 @@
 import * as path from 'path';
 
-export function generateDesignerCode(resxPath: string, resources: { [key: string]: { value: string; comment?: string } }, accessLevel: 'public' | 'internal' = 'public'): string {
+export function generateDesignerCode(resxPath: string, resources: { [key: string]: { value: string; comment?: string } }, accessLevel: 'public' | 'internal' = 'public', existingNamespace?: string): string {
     const fileName = path.basename(resxPath, '.resx');
-    const namespaceName = fileName.includes('.') ? fileName.split('.')[0] : 'Resources';
+    // Use existing namespace if available, otherwise compute from filename
+    const namespaceName = existingNamespace || (fileName.includes('.') ? fileName.split('.')[0] : 'Resources');
     const className = fileName.includes('.') ? fileName.split('.')[1] : fileName;
 
     let code = `//------------------------------------------------------------------------------
@@ -18,9 +19,14 @@ export function generateDesignerCode(resxPath: string, resources: { [key: string
 namespace ${namespaceName} {
     using System;
     
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("VS Code RESX Editor", "1.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -66,11 +72,14 @@ namespace ${namespaceName} {
 
     // Generate a property for each resource
     for (const [key, resource] of Object.entries(resources)) {
+        // Always add a summary - either the comment or a default message
+        code += `        /// <summary>\n`;
         if (resource.comment) {
-            code += `        /// <summary>\n`;
             code += `        ///   ${resource.comment}\n`;
-            code += `        /// </summary>\n`;
+        } else {
+            code += `        ///   Looks up a localized string similar to ${resource.value}\n`;
         }
+        code += `        /// </summary>\n`;
         code += `        ${accessLevel} static string ${key} {
             get {
                 return ResourceManager.GetString("${key}", resourceCulture);

src/utilities/generateCode.ts

@@ -4,6 +4,17 @@ import * as path from 'path';
 import { generateDesignerCode } from './designerGenerator';
 import { printChannelOutput } from '../extension';
 
+async function extractExistingNamespace(designerPath: string): Promise<string | undefined> {
+    try {
+        const designerUri = vscode.Uri.file(designerPath);
+        const content = await vscode.workspace.fs.readFile(designerUri);
+        const match = content.toString().match(/namespace\s+([^\s{]+)/);
+        return match?.[1];
+    } catch {
+        return undefined;
+    }
+}
+
 async function checkResxGeneratorType(resxPath: string): Promise<'public' | 'internal'> {
     // Look for a .csproj file in the same directory or parent directories
     const dir = path.dirname(resxPath);
@@ -63,10 +74,13 @@ export async function generateAndUpdateDesignerFile(document: vscode.TextDocumen
         // Determine the access level based on .csproj settings
         const accessLevel = await checkResxGeneratorType(document.uri.fsPath);
 
-        // Generate and update the Designer.cs file
+        // Get the existing namespace if the Designer file exists
         const designerPath = document.uri.fsPath.replace('.resx', '.Designer.cs');
+        const existingNamespace = await extractExistingNamespace(designerPath);
+
+        // Generate and update the Designer.cs file
         const designerUri = vscode.Uri.file(designerPath);
-        const designerCode = generateDesignerCode(document.uri.fsPath, parsedJson, accessLevel);
+        const designerCode = generateDesignerCode(document.uri.fsPath, parsedJson, accessLevel, existingNamespace);
 
         try {
             await vscode.workspace.fs.stat(designerUri);