Add symbol scopes.

Extension/src/LanguageServer/Providers/documentSymbolProvider.ts

@@ -3,9 +3,13 @@
  * See 'LICENSE' in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 import * as vscode from 'vscode';
-import { DefaultClient, LocalizeDocumentSymbol, GetDocumentSymbolRequestParams, GetDocumentSymbolRequest } from '../client';
+import { DefaultClient, LocalizeDocumentSymbol, GetDocumentSymbolRequestParams, GetDocumentSymbolRequest, SymbolScope } from '../client';
 import * as util from '../../common';
 import { processDelayedDidOpen } from '../extension';
+import * as nls from 'vscode-nls';
+
+nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
+const localize: nls.LocalizeFunc = nls.loadMessageBundle();
 
 export class DocumentSymbolProvider implements vscode.DocumentSymbolProvider {
     private client: DefaultClient;
@@ -16,7 +20,20 @@ export class DocumentSymbolProvider implements vscode.DocumentSymbolProvider {
         const documentSymbols: vscode.DocumentSymbol[] = [];
         if (symbols) {
             symbols.forEach((symbol) => {
-                const detail: string = util.getLocalizedString(symbol.detail);
+                let detail: string = util.getLocalizedString(symbol.detail);
+                if (symbol.scope === SymbolScope.Private) {
+                    if (detail.length === 0) {
+                        detail = "private";
+                    } else {
+                        detail = localize("c.cpp.symbolscope.separator", "{0}, {1}", "private", detail);
+                    }
+                } else if (symbol.scope === SymbolScope.Protected) {
+                    if (detail.length === 0) {
+                        detail = "protected";
+                    } else {
+                        detail = localize("c.cpp.symbolscope.separator", "{0}, {1}", "protected", detail);
+                    }
+                }
                 const r: vscode.Range = new vscode.Range(symbol.range.start.line, symbol.range.start.character, symbol.range.end.line, symbol.range.end.character);
                 const sr: vscode.Range = new vscode.Range(symbol.selectionRange.start.line, symbol.selectionRange.start.character, symbol.selectionRange.end.line, symbol.selectionRange.end.character);
                 const vscodeSymbol: vscode.DocumentSymbol = new vscode.DocumentSymbol(symbol.name, detail, symbol.kind, r, sr);

Extension/src/LanguageServer/Providers/workspaceSymbolProvider.ts

@@ -3,8 +3,12 @@
  * See 'LICENSE' in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
 import * as vscode from 'vscode';
-import { DefaultClient, GetSymbolInfoRequest, WorkspaceSymbolParams, LocalizeSymbolInformation } from '../client';
+import { DefaultClient, GetSymbolInfoRequest, WorkspaceSymbolParams, LocalizeSymbolInformation, SymbolScope } from '../client';
 import * as util from '../../common';
+import * as nls from 'vscode-nls';
+
+nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
+const localize: nls.LocalizeFunc = nls.loadMessageBundle();
 
 export class WorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvider {
     private client: DefaultClient;
@@ -22,10 +26,21 @@ export class WorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvider {
 
         // Convert to vscode.Command array
         symbols.forEach((symbol) => {
-            const suffix: string = util.getLocalizedString(symbol.suffix);
+            let suffix: string = util.getLocalizedString(symbol.suffix);
             let name: string = symbol.name;
             if (suffix.length) {
+                if (symbol.scope === SymbolScope.Private) {
+                    suffix = localize("c.cpp.symbolscope.separator", "{0}, {1}", "private", suffix);
+                } else if (symbol.scope === SymbolScope.Protected) {
+                    suffix = localize("c.cpp.symbolscope.separator", "{0}, {1}", "protected", suffix);
+                }
                 name = name + ' (' + suffix + ')';
+            } else {
+                if (symbol.scope === SymbolScope.Private) {
+                    name = name + " (private)";
+                } else if (symbol.scope === SymbolScope.Protected) {
+                    name = name + " (protected)";
+                }
             }
             const range: vscode.Range = new vscode.Range(symbol.location.range.start.line, symbol.location.range.start.character, symbol.location.range.end.line, symbol.location.range.end.character);
             const uri: vscode.Uri = vscode.Uri.parse(symbol.location.uri.toString());

Extension/src/LanguageServer/client.ts

@@ -297,10 +297,17 @@ export interface WorkspaceSymbolParams extends WorkspaceFolderParams {
     query: string;
 }
 
+export enum SymbolScope {
+    Public = 0,
+    Protected = 1,
+    Private = 2
+}
+
 export interface LocalizeDocumentSymbol {
     name: string;
     detail: LocalizeStringParams;
     kind: vscode.SymbolKind;
+    scope: SymbolScope;
     range: Range;
     selectionRange: Range;
     children: LocalizeDocumentSymbol[];
@@ -315,6 +322,7 @@ interface Location {
 export interface LocalizeSymbolInformation {
     name: string;
     kind: vscode.SymbolKind;
+    scope: SymbolScope;
     location: Location;
     containerName: string;
     suffix: LocalizeStringParams;