Skip to content
This repository has been archived by the owner on Jul 15, 2023. It is now read-only.

Differentiate between interfaces and structs in outline #2114

Merged
merged 9 commits into from
Nov 21, 2018
Merged

Differentiate between interfaces and structs in outline #2114

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c2e20e2
Differentiate between interface and struct
karthikraobr Nov 10, 2018
2d5aeed
Use regex to match structs
karthikraobr Nov 11, 2018
5f2e1db
Merge branch 'master' of https://github.com/Microsoft/vscode-go into …
karthikraobr Nov 11, 2018
d697107
Change to regex test
karthikraobr Nov 11, 2018
e05d035
Improved regex
karthikraobr Nov 11, 2018
00f56ef
Stricter regex
ramya-rao-a Nov 14, 2018
169ac3c
Added test case for struct outline
karthikraobr Nov 14, 2018
0ca0cc0
Merge branch 'master' of https://github.com/Microsoft/vscode-go into …
karthikraobr Nov 14, 2018
a942372
Minimum 1 space needed between words
ramya-rao-a Nov 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/goOutline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ const goKindToCodeKind: { [key: string]: vscode.SymbolKind } = {
'import': vscode.SymbolKind.Namespace,
'variable': vscode.SymbolKind.Variable,
'type': vscode.SymbolKind.Interface,
'function': vscode.SymbolKind.Function
'function': vscode.SymbolKind.Function,
'struct': vscode.SymbolKind.Struct,
};


Expand All @@ -149,11 +150,17 @@ function convertToCodeSymbols(
label = '(' + decl.receiverType + ').' + label;
}


let range = null;
if (document && byteOffsetToDocumentOffset) {
let start = byteOffsetToDocumentOffset(decl.start - 1);
let end = byteOffsetToDocumentOffset(decl.end - 1);
range = new vscode.Range(document.positionAt(start), document.positionAt(end));
if (decl.type === 'type') {
let line = document.lineAt(document.positionAt(start));
let regex = new RegExp('\\bstruct\\b');
karthikraobr marked this conversation as resolved.
Show resolved Hide resolved
decl.type = line.text.match(regex) ? 'struct' : 'type';
}
}

let symbolInfo = new vscode.SymbolInformation(
Expand Down