Rename doxygen settings (#9734)

Author: Colengms

Extension/package.json

@@ -2333,22 +2333,22 @@
           "markdownDescription": "%c_cpp.configuration.simplifyStructuredComments.markdownDescription%",
           "scope": "application"
         },
-        "C_Cpp.autocompleteDoxygenComment":{
-          "type":"boolean",
-          "default":true,
-          "description": "%c_cpp.configuration.autocompleteDoxygenComment.description%",
+        "C_Cpp.doxygen.generateOnType":{
+          "type": "boolean",
+          "default": true,
+          "description": "%c_cpp.configuration.doxygen.generateOnType.description%",
           "scope": "resource"
         },
-        "C_Cpp.generatedDoxygenCommentStyle": {
-          "type":"string",
+        "C_Cpp.doxygen.generatedStyle": {
+          "type": "string",
           "enum":[
             "///",
             "/**",
             "/*!",
             "//!"
           ],
-          "default":"/**",
-          "description": "%c_cpp.configuration.generatedDoxygenCommentStyle.description%",
+          "default": "/**",
+          "description": "%c_cpp.configuration.doxygen.generatedStyle.description%",
           "scope": "resource"
         },
         "C_Cpp.commentContinuationPatterns": {
@@ -2898,9 +2898,8 @@
       },
       {
         "command": "C_Cpp.GenerateDoxygenComment", 
-        "title":"%c_cpp.command.GenerateDoxygenComment.title%",
-        "category":"C/C++"
-                   
+        "title": "%c_cpp.command.GenerateDoxygenComment.title%",
+        "category": "C/C++"
       }
     ],
     "keybindings": [

Extension/package.nls.json

@@ -184,9 +184,9 @@
     "c_cpp.configuration.exclusionPolicy.checkFilesAndFolders.description": "The exclusion filters will be evaluated against every file and folder encountered.",
     "c_cpp.configuration.preferredPathSeparator.markdownDescription": { "message": "The character used as a path separator for `#include` auto-completion results.", "comment": [ "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered." ] },
     "c_cpp.configuration.simplifyStructuredComments.markdownDescription": { "message": "If `true`, tooltips of hover and auto-complete will only display certain labels of structured comments. Otherwise, all comments are displayed.", "comment": [ "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered." ] },
+    "c_cpp.configuration.doxygen.generateOnType.description":  "Controls whether to automatically insert the Doxygen comment after typing the chosen comment style.",
+    "c_cpp.configuration.doxygen.generatedStyle.description": "The string of characters used as the starting line of the Doxygen comment.",
     "c_cpp.configuration.commentContinuationPatterns.items.anyof.string.markdownDescription": { "message": "The pattern that begins a multiline or single line comment block. The continuation pattern defaults to ` * ` for multiline comment blocks or this string for single line comment blocks.", "comment": [ "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered." ] },
-    "c_cpp.configuration.autocompleteDoxygenComment.description":  "Controls whether to automatically insert the Doxygen comment after typing the chosen comment style.",
-    "c_cpp.configuration.generatedDoxygenCommentStyle.description": "The string of characters used as the starting line of the Doxygen comment.",
     "c_cpp.configuration.commentContinuationPatterns.items.anyof.object.begin.description": "The pattern that begins a multiline or single line comment block.",
     "c_cpp.configuration.commentContinuationPatterns.items.anyof.object.continue.description": "The text that will be inserted on the next line when Enter is pressed inside a multiline or single line comment block.",
     "c_cpp.configuration.commentContinuationPatterns.description": "Defines the editor behavior for when the Enter key is pressed inside a multiline or single line comment block.",

Extension/src/LanguageServer/client.ts

@@ -997,8 +997,8 @@ export class DefaultClient implements Client {
         const settings_suggestSnippets: (boolean | undefined)[] = [];
         const settings_exclusionPolicy: (string | undefined)[] = [];
         const settings_preferredPathSeparator: (string | undefined)[] = [];
-        const settings_generatedDoxygenCommentStyle: (string | undefined)[] = [];
-        const settings_autocompleteDoxygenComment: (boolean | undefined)[] = [];
+        const settings_doxygenGeneratedCommentStyle: (string | undefined)[] = [];
+        const settings_doxygenGenerateOnType: (boolean | undefined)[] = [];
         const settings_defaultSystemIncludePath: (string[] | undefined)[] = [];
         const settings_intelliSenseCachePath: (string | undefined)[] = [];
         const settings_intelliSenseCacheSize: (number | undefined)[] = [];
@@ -1166,8 +1166,8 @@ export class DefaultClient implements Client {
                 settings_suggestSnippets.push(setting.suggestSnippets);
                 settings_exclusionPolicy.push(setting.exclusionPolicy);
                 settings_preferredPathSeparator.push(setting.preferredPathSeparator);
-                settings_generatedDoxygenCommentStyle.push(setting.generatedDoxygenCommentStyle);
-                settings_autocompleteDoxygenComment.push(setting.autocompleteDoxygenComment);
+                settings_doxygenGeneratedCommentStyle.push(setting.doxygenGeneratedCommentStyle);
+                settings_doxygenGenerateOnType.push(setting.doxygenGenerateOnType);
                 settings_defaultSystemIncludePath.push(setting.defaultSystemIncludePath);
                 settings_intelliSenseCachePath.push(util.resolveCachePath(setting.intelliSenseCachePath, this.AdditionalEnvironment));
                 settings_intelliSenseCacheSize.push(setting.intelliSenseCacheSize);
@@ -1352,8 +1352,10 @@ export class DefaultClient implements Client {
                 enhancedColorization: settings_enhancedColorization,
                 suggestSnippets: settings_suggestSnippets,
                 simplifyStructuredComments: workspaceSettings.simplifyStructuredComments,
-                generatedDoxygenCommentStyle: settings_generatedDoxygenCommentStyle,
-                autocompleteDoxygenComment: settings_autocompleteDoxygenComment,
+                doxygen: {
+                    generatedStyle: settings_doxygenGeneratedCommentStyle,
+                    generateOnType: settings_doxygenGenerateOnType
+                },
                 loggingLevel: workspaceSettings.loggingLevel,
                 workspaceParsingPriority: workspaceSettings.workspaceParsingPriority,
                 workspaceSymbols: workspaceSettings.workspaceSymbols,
@@ -1461,6 +1463,9 @@ export class DefaultClient implements Client {
                     },
                     space: vscode.workspace.getConfiguration("C_Cpp.vcFormat.space", this.RootUri),
                     wrap: vscode.workspace.getConfiguration("C_Cpp.vcFormat.wrap", this.RootUri)
+                },
+                doxygen: {
+                    ...vscode.workspace.getConfiguration("C_Cpp.doxygen", this.RootUri)
                 }
             },
             editor: {

Extension/src/LanguageServer/settings.ts

@@ -221,8 +221,8 @@ export class CppSettings extends Settings {
     public get workspaceSymbols(): string | undefined { return super.Section.get<string>("workspaceSymbols"); }
     public get exclusionPolicy(): string | undefined { return super.Section.get<string>("exclusionPolicy"); }
     public get simplifyStructuredComments(): boolean | undefined { return super.Section.get<boolean>("simplifyStructuredComments"); }
-    public get generatedDoxygenCommentStyle(): string | undefined { return super.Section.get<string>("generatedDoxygenCommentStyle"); }
-    public get autocompleteDoxygenComment(): boolean | undefined { return super.Section.get<boolean>("autocompleteDoxygenComment"); }
+    public get doxygenGeneratedCommentStyle(): string | undefined { return super.Section.get<string>("doxygen.generatedStyle"); }
+    public get doxygenGenerateOnType(): boolean | undefined { return super.Section.get<boolean>("doxygen.generateOnType"); }
     public get commentContinuationPatterns(): (string | CommentPattern)[] | undefined { return super.Section.get<(string | CommentPattern)[]>("commentContinuationPatterns"); }
     public get configurationWarnings(): string | undefined { return super.Section.get<string>("configurationWarnings"); }
     public get preferredPathSeparator(): string | undefined { return super.Section.get<string>("preferredPathSeparator"); }