Skip to content

Add Specific No Result Found Messages for Implementations and Type Definition #22112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjbvz merged 1 commit into from
Mar 7, 2017
Merged

Add Specific No Result Found Messages for Implementations and Type Definition #22112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 31 additions & 22 deletions src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,7 @@ export class DefinitionAction extends EditorAction {

if (result.length === 0) {
const info = model.getWordAtPosition(pos);
const message = info && info.word
? nls.localize('noResultWord', "No definition found for '{0}'", info.word)
: nls.localize('generic.noResults', "No definition found");

MessageController.get(editor).showMessage(message, pos);
MessageController.get(editor).showMessage(this.getNoResultFoundMessage(info), pos);
return;
}

Expand All @@ -111,6 +107,12 @@ export class DefinitionAction extends EditorAction {
return getDefinitionsAtPosition(model, position);
}

protected getNoResultFoundMessage(info?: editorCommon.IWordAtPosition): string {
return info && info.word
? nls.localize('noResultWord', "No definition found for '{0}'", info.word)
: nls.localize('generic.noResults', "No definition found");
}

private _onResult(editorService: IEditorService, editor: editorCommon.ICommonCodeEditor, model: ReferencesModel) {
if (this._configuration.openInPeek) {
this._openInPeek(editorService, editor, model);
Expand Down Expand Up @@ -231,9 +233,20 @@ export class PeekDefinitionAction extends DefinitionAction {
}
}

export class ImplementationAction extends DefinitionAction {
protected getDeclarationsAtPosition(model: editorCommon.IModel, position: corePosition.Position): TPromise<Location[]> {
return getImplementationsAtPosition(model, position);
}

protected getNoResultFoundMessage(info?: editorCommon.IWordAtPosition): string {
return info && info.word
? nls.localize('goToImplementation.noResultWord', "No implementation found for '{0}'", info.word)
: nls.localize('goToImplementation.generic.noResults', "No implementation found");
}
}

@editorAction
export class GoToImplementationAction extends DefinitionAction {
export class GoToImplementationAction extends ImplementationAction {

public static ID = 'editor.action.goToImplementation';

Expand All @@ -255,14 +268,10 @@ export class GoToImplementationAction extends DefinitionAction {
}
});
}

protected getDeclarationsAtPosition(model: editorCommon.IModel, position: corePosition.Position): TPromise<Location[]> {
return getImplementationsAtPosition(model, position);
}
}

@editorAction
export class PeekImplementationAction extends DefinitionAction {
export class PeekImplementationAction extends ImplementationAction {

public static ID = 'editor.action.peekImplementation';

Expand All @@ -280,14 +289,22 @@ export class PeekImplementationAction extends DefinitionAction {
}
});
}
}

export class TypeDefinitionAction extends DefinitionAction {
protected getDeclarationsAtPosition(model: editorCommon.IModel, position: corePosition.Position): TPromise<Location[]> {
return getImplementationsAtPosition(model, position);
return getTypeDefinitionsAtPosition(model, position);
}

protected getNoResultFoundMessage(info?: editorCommon.IWordAtPosition): string {
return info && info.word
? nls.localize('goToTypeDefinition.noResultWord', "No type definition found for '{0}'", info.word)
: nls.localize('goToTypeDefinition.generic.noResults', "No type definition found");
}
}

@editorAction
export class GoToTypeDefintionAction extends DefinitionAction {
export class GoToTypeDefintionAction extends TypeDefinitionAction {

public static ID = 'editor.action.goToTypeDefinition';

Expand All @@ -309,14 +326,10 @@ export class GoToTypeDefintionAction extends DefinitionAction {
}
});
}

protected getDeclarationsAtPosition(model: editorCommon.IModel, position: corePosition.Position): TPromise<Location[]> {
return getTypeDefinitionsAtPosition(model, position);
}
}

@editorAction
export class PeekTypeDefinitionAction extends DefinitionAction {
export class PeekTypeDefinitionAction extends TypeDefinitionAction {

public static ID = 'editor.action.peekTypeDefinition';

Expand All @@ -334,10 +347,6 @@ export class PeekTypeDefinitionAction extends DefinitionAction {
}
});
}

protected getDeclarationsAtPosition(model: editorCommon.IModel, position: corePosition.Position): TPromise<Location[]> {
return getTypeDefinitionsAtPosition(model, position);
}
}


Expand Down