sharpetronics/geany
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the Ferite filetype

Browse Source 
Replace the gap in filetypes array with the recently added GDScript
filetype.
This commit is contained in:
Jiří Techet 2022-01-15 20:32:23 +01:00
parent c9cb5e4fe2
commit c0b7940f90
12 changed files with 6 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/Makefile.am
View File

@ -30,7 +30,6 @@ filetypes_dist = \
filedefs/filetypes.docbook \
filedefs/filetypes.erlang \
filedefs/filetypes.f77 \
filedefs/filetypes.ferite \
filedefs/filetypes.forth \
filedefs/filetypes.fortran \
filedefs/filetypes.freebasic \

46
data/filedefs/filetypes.ferite
View File

@ -1,46 +0,0 @@
# For complete documentation of this file, please see Geany's main documentation
[styling=C]
[keywords]
# all items must be in one line
primary=false null self super true abstract alias and arguments attribute_missing break case class closure conformsToProtocol constructor continue default deliver destructor diliver directive do else extends eval final fix for function global handle if iferr implements include instanceof isa method_missing modifies monitor namespace new or private protected protocol public raise recipient rename return static switch uses using while
types=boolean string number array object void XML Unix Sys String Stream Serialize RMI Posix Number Network Math FileSystem Console Array Regexp XSLT
docComment=brief class declaration description end example extends function group implements modifies module namespace param protocol return return static type variable warning
[lexer_properties=C]
[settings]
# default extension used when saving files
extension=fe
# the following characters are these which a "word" can contains, see documentation
#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
# single comments, like # in this file
comment_single=//
# multiline comments
comment_open=/*
comment_close=*/
# set to false if a comment character/string should start at column 0 of a line, true uses any
# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d
#command_example();
# setting to false would generate this
# command_example();
# This setting works only for single line comments
comment_use_indent=true
# context action command (please see Geany's main documentation for details)
context_action_cmd=
[indentation]
#width=4
# 0 is spaces, 1 is tabs, 2 is tab & spaces
#type=1
[build_settings]
# %f will be replaced by the complete filename
# %e will be replaced by the filename without extension
# (use only one of it at one time)
compiler=ferite -vc "%f"
run_cmd=ferite "%f"

1
data/filetype_extensions.conf
View File

@ -28,7 +28,6 @@ Diff=*.diff;*.patch;*.rej;
Docbook=*.docbook;
Erlang=*.erl;*.hrl;
F77=*.f;*.for;*.ftn;*.f77;*.F;*.FOR;*.FTN;*.fpp;*.FPP;
Ferite=*.fe;
Forth=*.fs;*.fth;
Fortran=*.f90;*.f95;*.f03;*.f08;*.F90;*.F95;*.F03;*.F08;
FreeBasic=*.bas;*.bi;*.vbs;

4
data/snippets.conf
View File

@ -119,10 +119,6 @@ with=with %cursor%:\n\t
def=def %cursor% (%cursor%):\n\t""" Function doc """\n\t
class=class %cursor%:\n\t""" Class doc """\n\t\n\tdef __init__ (self):\n\t\t""" Class initialiser """\n\t\tpass
[Ferite]
iferr=iferr%block_cursor%fix%block%
monitor=monitor%block_cursor%handle%block%
[Haskell]
[HTML]

3
src/filetypes.c
View File

@ -146,7 +146,7 @@ static void init_builtin_filetypes(void)
FT_INIT( RUBY, RUBY, "Ruby", NULL, SOURCE_FILE, SCRIPT );
FT_INIT( TCL, TCL, "Tcl", NULL, SOURCE_FILE, SCRIPT );
FT_INIT( LUA, LUA, "Lua", NULL, SOURCE_FILE, SCRIPT );
FT_INIT( FERITE, NONE, "Ferite", NULL, SOURCE_FILE, SCRIPT );
FT_INIT( GDSCRIPT, GDSCRIPT, "GDScript", NULL, SOURCE_FILE, SCRIPT );
FT_INIT( HASKELL, HASKELL, "Haskell", NULL, SOURCE_FILE, COMPILED );
FT_INIT( MARKDOWN, MARKDOWN, "Markdown", NULL, SOURCE_FILE, MARKUP );
FT_INIT( TXT2TAGS, TXT2TAGS, "Txt2tags", NULL, SOURCE_FILE, MARKUP );
@ -188,7 +188,6 @@ static void init_builtin_filetypes(void)
FT_INIT( ZEPHIR, ZEPHIR, "Zephir", NULL, SOURCE_FILE, COMPILED );
FT_INIT( SMALLTALK, NONE, "Smalltalk", NULL, SOURCE_FILE, SCRIPT );
FT_INIT( JULIA, JULIA, "Julia", NULL, SOURCE_FILE, SCRIPT );
FT_INIT( GDSCRIPT, GDSCRIPT, "GDScript", NULL, SOURCE_FILE, SCRIPT );
}

3
src/filetypes.h
View File

@ -50,7 +50,7 @@ typedef enum
GEANY_FILETYPES_MATLAB,
GEANY_FILETYPES_RUBY,
GEANY_FILETYPES_LUA,
GEANY_FILETYPES_FERITE,
GEANY_FILETYPES_GDSCRIPT,
GEANY_FILETYPES_YAML,
GEANY_FILETYPES_C,
GEANY_FILETYPES_NSIS,
@ -108,7 +108,6 @@ typedef enum
GEANY_FILETYPES_BIBTEX,
GEANY_FILETYPES_SMALLTALK,
GEANY_FILETYPES_JULIA,
GEANY_FILETYPES_GDSCRIPT,
/* ^ append items here */
GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */
}

2
src/highlighting.c
View File

@ -1015,7 +1015,6 @@ void highlighting_init_styles(guint filetype_idx, GKeyFile *config, GKeyFile *co
init_styleset_case(LISP);
init_styleset_case(ERLANG);
init_styleset_case(DOCBOOK);
init_styleset_case(FERITE);
init_styleset_case(F77);
init_styleset_case(FORTH);
init_styleset_case(FORTRAN);
@ -1106,7 +1105,6 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft)
styleset_case(LISP);
styleset_case(ERLANG);
styleset_case(DOCBOOK);
styleset_case(FERITE);
styleset_case(F77);
styleset_case(FORTH);
styleset_case(FORTRAN);

12
src/highlightingmappings.h
View File

@ -606,18 +606,6 @@ static const HLKeyword highlighting_keywords_F77[] =
#define highlighting_properties_F77 EMPTY_PROPERTIES
/* Ferite */
#define highlighting_lexer_FERITE SCLEX_CPP
#define highlighting_styles_FERITE highlighting_styles_C
static const HLKeyword highlighting_keywords_FERITE[] =
{
{ 0, "primary", FALSE },
{ 1, "types", FALSE },
{ 2, "docComment", FALSE }
};
#define highlighting_properties_FERITE highlighting_properties_C
/* Forth */
#define highlighting_lexer_FORTH SCLEX_FORTH
static const HLStyle highlighting_styles_FORTH[] =

20
src/msgwindow.c
View File

@ -1008,26 +1008,6 @@ static void parse_compiler_error_line(const gchar *string,
}
break;
}
case GEANY_FILETYPES_FERITE:
{
/* Error: Parse Error: on line 5 in "/tmp/hello.fe"
* Error: Compile Error: on line 24, in /test/class.fe */
if (strncmp(string, "Error: Compile Error", 20) == 0)
{
data.pattern = " ";
data.min_fields = 8;
data.line_idx = 5;
data.file_idx = 7;
}
else
{
data.pattern = " \"";
data.min_fields = 10;
data.line_idx = 5;
data.file_idx = 8;
}
break;
}
case GEANY_FILETYPES_HTML:
{
/* line 78 column 7 - Warning: <table> missing '>' for end of tag */

5
src/tagmanager/tm_parser.c
View File

@ -402,8 +402,6 @@ static TMParserMapEntry map_F77[] = {
#define map_FORTRAN map_F77
#define map_UNUSED1 map_HASKELL
/* different parser than in universal-ctags */
static TMParserMapEntry map_MATLAB[] = {
{'f', tm_tag_function_t},
@ -640,7 +638,7 @@ static TMParserMap parser_map[] = {
MAP_ENTRY(SH),
MAP_ENTRY(D),
MAP_ENTRY(FORTRAN),
MAP_ENTRY(UNUSED1),
MAP_ENTRY(GDSCRIPT),
MAP_ENTRY(DIFF),
MAP_ENTRY(VHDL),
MAP_ENTRY(LUA),
@ -673,7 +671,6 @@ static TMParserMap parser_map[] = {
MAP_ENTRY(POWERSHELL),
MAP_ENTRY(JULIA),
MAP_ENTRY(CPREPROCESSOR),
MAP_ENTRY(GDSCRIPT),
};
/* make sure the parser map is consistent and complete */
G_STATIC_ASSERT(G_N_ELEMENTS(parser_map) == TM_PARSER_COUNT);

3
src/tagmanager/tm_parser.h
View File

@ -78,7 +78,7 @@ enum
TM_PARSER_SH,
TM_PARSER_D,
TM_PARSER_FORTRAN,
TM_PARSER_UNUSED1,
TM_PARSER_GDSCRIPT,
TM_PARSER_DIFF,
TM_PARSER_VHDL,
TM_PARSER_LUA,
@ -112,7 +112,6 @@ enum
TM_PARSER_JULIA,
TM_PARSER_BIBTEX,
TM_PARSER_CPREPROCESSOR,
TM_PARSER_GDSCRIPT,
TM_PARSER_COUNT
};

5
src/tagmanager/tm_parsers.h
View File

@ -34,7 +34,7 @@
ShParser, \
DParser, \
FortranParser, \
LiterateHaskellParser, /* dummy for removed Ferite parser */ \
GDScriptParser, \
DiffParser, \
VhdlParser, \
LuaParser, \
@ -67,7 +67,6 @@
PowerShellParser, \
JuliaParser, \
BibtexParser, \
CPreProParser, \
GDScriptParser
CPreProParser
#endif