paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-03 03:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

IDE: quickfix inherited method is hidden: add modifier override

Browse Source 
git-svn-id: trunk@57920 -
This commit is contained in:
mattias 2018-05-13 12:00:23 +00:00
parent 087d883674
commit 04805d25f4
3 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ide/etquickfixes.pas
View File

@ -310,6 +310,10 @@ begin
// function hides identifier at "$1". Use overload or reintroduce
MsgID:=3021;
Result:=true;
end else if IDEPas2jsParser.MsgLineIsId(Msg,3077,Value1,Value2) then begin
// Method "$1" hides method of base type "$2" at $3
MsgID:=3077;
Result:=true;
end;
end;
@ -318,15 +322,15 @@ procedure TQuickFixInheritedMethodIsHidden_AddModifier.CreateMenuItems(
var
i, MsgID: Integer;
Msg: TMessageLine;
aCaption: String;
begin
for i:=0 to Fixes.LineCount-1 do begin
Msg:=Fixes.Lines[i];
if not IsApplicable(Msg,MsgID) then continue;
aCaption:=lisAddModifierOverload;
Fixes.AddMenuItem(Self,Msg,aCaption,1);
aCaption:=lisAddModifierReintroduce;
Fixes.AddMenuItem(Self,Msg,aCaption,2);
if ((Msg.SubTool=SubToolFPC) and (MsgID=3057))
or ((Msg.SubTool=SubToolPas2js) and (MsgID=3077)) then
Fixes.AddMenuItem(Self, Msg, lisAddModifierOverride, 3);
Fixes.AddMenuItem(Self,Msg,lisAddModifierOverload,1);
Fixes.AddMenuItem(Self,Msg,lisAddModifierReintroduce,2);
end;
end;
@ -354,10 +358,11 @@ begin
OldChange:=LazarusIDE.OpenEditorsOnCodeToolChange;
LazarusIDE.OpenEditorsOnCodeToolChange:=true;
try
if Fixes.CurrentCommand.Tag=2 then
aModifier:='reintroduce'
else
aModifier:='overload';
case Fixes.CurrentCommand.Tag of
2: aModifier:='reintroduce';
3: aModifier:='override';
else aModifier:='overload';
end;
if not CodeToolBoss.AddProcModifier(Code,Msg.Column,Msg.Line,aModifier) then
begin

1
ide/lazarusidestrconsts.pas
View File

@ -6396,6 +6396,7 @@ resourcestring
+'s off} to unit "%s"';
lisAddModifierOverload = 'Add modifier "overload"';
lisAddModifierReintroduce = 'Add modifier "reintroduce"';
lisAddModifierOverride = 'Add modifier "override"';
lisHideWithProjectOptionVm = 'Hide with project option (-vm%s)';
lisHideWithPackageOptionVm = 'Hide with package option (-vm%s)';
lisRemoveLocalVariable3 = 'Remove local variable "%s"';

27
ide/pas2jsmsg.txt
View File

@ -44,15 +44,38 @@ general_i_abslines_compiled=01008_I_$1 lines compiled, $2 sec$3
general_f_compilation_aborted=01018_F_Compilation aborted
% Compilation was aborted.
sym_e_id_not_found=03001_E_Identifier not found "$1"
% The compiler doesn't know this symbol. Usually happens when you misspell
% the name of a variable or procedure, or when you forget to declare a
% variable.
parser_h_function_hides_nonvirtualproc=03021_H_function hides identifier at "$1". Use overload or reintroduce
% A function hides an identifier.
parser_w_method_hides_virtualmethod=03077_W_Method "$1" hides method of base type "$2" at $3
% A method that is declared \var{virtual} in a parent class, should be
% overridden in the descendant class with the \var{override} directive. If you
% don't specify the \var{override} directive, you will hide the parent method;
% you will not override it.
parser_i_compiling=03104_I_Compiling $1 ...
% When you turn on information messages (\var{-vi}), the compiler tells you
% what units it is recompiling.
% what units it is (re)compiling.
type_w_instance_with_abstract=Constructing a class "$1" with abstract method "$2"
% An instance of a class is created which contains non-implemented abstract
% methods. This will probably lead to a runtime error 211 in the code if that
% routine is ever called. All abstract methods should be overridden.
sym_h_local_identifier_not_used=05025_H_Local variable "$1" not used
% You have declared, but not used, a variable in a procedure or function
% implementation.
sym_e_no_matching_implementation_found=05042_E_No matching implementation for interface method "$1" found
% There was no matching method found which could implement the interface
% method. Check argument types and result type of the methods.
#
# Logo (option -l)
#
option_logo=11023_[
Pas2JS Compiler version $PAS2JSFULLVERSION [$FPCDATE] for $FPCCPU
Pas2JS Compiler version $PAS2JSVERSIONTXT [$PAS2JSDATE] for $PAS2JSSRCOS-$PAS2JSSRCCPU
Copyright (c) 2016-2018 by Mattias Gaertner and others
]