experiment with internal hierarchical model, #34968

src/vs/editor/common/modes.ts

@@ -647,6 +647,10 @@ export interface SymbolInformation {
  * The name of this symbol.
  */
  name: string;
+ /**
+ * The detail of this symbol.
+ */
+ detail?: string;
  /**
  * The name of the symbol containing this symbol.
  */
@@ -659,6 +663,12 @@ export interface SymbolInformation {
  * The location of this symbol.
  */
  location: Location;
+ /**
+ * The defining range of this symbol.
+ */
+ definingRange: IRange;
+
+ children?: SymbolInformation[];
 }
 /**
  * The document symbol provider interface defines the contract between extensions and

src/vs/editor/contrib/quickOpen/quickOpen.ts

@@ -17,15 +17,13 @@ import { asWinJsPromise } from 'vs/base/common/async';
 
 export function getDocumentSymbols(model: ITextModel): TPromise<IOutline> {
 
- let entries: SymbolInformation[] = [];
+ let roots: SymbolInformation[] = [];
 
  let promises = DocumentSymbolProviderRegistry.all(model).map(support => {
 
- return asWinJsPromise((token) => {
- return support.provideDocumentSymbols(model, token);
- }).then(result => {
+ return asWinJsPromise(token => support.provideDocumentSymbols(model, token)).then(result => {
  if (Array.isArray(result)) {
- entries.push(...result);
+ roots.push(...result);
  }
  }, err => {
  onUnexpectedExternalError(err);
@@ -34,7 +32,7 @@ export function getDocumentSymbols(model: ITextModel): TPromise<IOutline> {
 
  return TPromise.join(promises).then(() => {
  let flatEntries: SymbolInformation[] = [];
- flatten(flatEntries, entries, '');
+ flatten(flatEntries, roots, '');
  flatEntries.sort(compareEntriesUsingStart);
 
  return {
@@ -51,10 +49,16 @@ function flatten(bucket: SymbolInformation[], entries: SymbolInformation[], over
  for (let entry of entries) {
  bucket.push({
  kind: entry.kind,
- location: entry.location,
  name: entry.name,
- containerName: entry.containerName || overrideContainerLabel
+ detail: entry.detail,
+ containerName: entry.containerName || overrideContainerLabel,
+ location: entry.location,
+ definingRange: entry.definingRange,
+ children: undefined, // we flatten it...
  });
+ if (entry.children) {
+ flatten(bucket, entry.children, entry.name);
+ }
  }
 }
 

src/vs/monaco.d.ts

@@ -4861,6 +4861,10 @@ declare namespace monaco.languages {
  * The name of this symbol.
  */
  name: string;
+ /**
+ * The detail of this symbol.
+ */
+ detail?: string;
  /**
  * The name of the symbol containing this symbol.
  */
@@ -4873,6 +4877,11 @@ declare namespace monaco.languages {
  * The location of this symbol.
  */
  location: Location;
+ /**
+ * The defining range of this symbol.
+ */
+ definingRange: IRange;
+ children?: SymbolInformation[];
  }
 
  /**

src/vs/workbench/api/node/extHostApiCommands.ts

@@ -278,7 +278,7 @@ export class ExtHostApiCommands {
  const result: types.SymbolInformation[] = [];
  if (Array.isArray(value)) {
  for (let tuple of value) {
- result.push(...tuple[1].map(typeConverters.toSymbolInformation));
+ result.push(...tuple[1].map(typeConverters.SymbolInformation.to));
  }
  }
  return result;
@@ -418,7 +418,7 @@ export class ExtHostApiCommands {
  };
  return this._commands.executeCommand<modes.IOutline>('_executeDocumentSymbolProvider', args).then(value => {
  if (value && Array.isArray(value.entries)) {
- return value.entries.map(typeConverters.toSymbolInformation);
+ return value.entries.map(typeConverters.SymbolInformation.to);
  }
  return undefined;
  });