From bc7a573ae802e4d73ff850a21001057907b9b3b6 Mon Sep 17 00:00:00 2001 From: Vincent Corallo Date: Mon, 13 Jun 2022 13:56:44 +0200 Subject: [PATCH 1/7] chore: add generation function and header function for main file --- Engine/G4d/template-project.env | 36 ++++++++++++++++++- Engine/Log/_main_.env | 14 +++++++- Engine/Make/_main_.env | 62 +++++++++++++++++++++++++++++++++ Source/Aws/_main_.env | 13 +++++++ 4 files changed, 123 insertions(+), 2 deletions(-) diff --git a/Engine/G4d/template-project.env b/Engine/G4d/template-project.env index 82a97e5..4059809 100644 --- a/Engine/G4d/template-project.env +++ b/Engine/G4d/template-project.env @@ -805,4 +805,38 @@ _t4dUtilsProjectEnd(){ echo '' echo '_wksInit' ############################### -} \ No newline at end of file +} + +_t4dUtilsProjectMainHeader(){ +# Generated From $Tools4Dev_PATH/Engine/G4d/templates.env +# v1.8.0 +###### _t4dUtilsProjectMainHeader +# - Name: +# _t4dUtilsProjectMainHeader +### +# - Synopsis: +# Generate main Header +### +# - Note: +# +# [Optionnal] +# {XXXXXXX} = Value To Be Changed, if {URL} then replace {URL} with a valid URL +### +###### DOCUMENTATION BLOC ##### +########### CODE BLOC ######### +echo '#### PROJECT HEADER BLOC' +echo "# Generated From $T4D_GENERATOR_PATH" +echo "# v$T4D_GENERATOR_VERSION" +echo '#' +echo '# - Name:' +echo '#
' +echo '###' +echo '# - Description:' +echo '# A textual description of the functioning of the command or function.' +echo '###' +echo '# - Builtins:' +echo '# false' +echo '###' +echo '#### HEADER BLOC ####' +############################### +} diff --git a/Engine/Log/_main_.env b/Engine/Log/_main_.env index abd1c24..f9f1e4f 100644 --- a/Engine/Log/_main_.env +++ b/Engine/Log/_main_.env @@ -1,4 +1,16 @@ - +#### PROJECT HEADER BLOC +# Generated From $Tools4Dev_PATH/Engine/G4d/templates-project.env +# v0.1 +# - Name: +# Engine/Log +### +# - Description: +# contains Prompt, colors,debugs and ckeck library +### +# - Builtins: +# True +### +#### HEADER BLOC #### source $Tools4Dev_PATH/Engine/Log/colors.env source $Tools4Dev_PATH/Engine/Log/debug.env diff --git a/Engine/Make/_main_.env b/Engine/Make/_main_.env index aa78136..3ef22de 100644 --- a/Engine/Make/_main_.env +++ b/Engine/Make/_main_.env @@ -480,3 +480,65 @@ cat >> $_File << EOF EOF } +_t4dMakeGeneratorVscodeBuiltins(){ +# Generated From $Tools4Dev_PATH/Engine/G4d/templates-project.env +# v1.8.0 +###### _t4dMakeGeneratorVscodeBuiltins +# - Name: +# _t4dMakeGeneratorVscodeBuiltins +### +# - Synopsis: +# Generate builtins when BuiltinsVSCode equals true in main file and add output file in Utils/T4D-Plugin-VSCode +### +# - Note: +# +# [Optionnal] +# {XXXXXXX} = Value To Be Changed, if {URL} then replace {URL} with a valid URL +### +###### DOCUMENTATION BLOC ##### +########### CODE BLOC ######### + local _t4dErrorCode=1 + + local _mainFiles="$(cat $Tools4Dev_PATH/.Ressources/index/private.index | cut -d ':' -f1 | rev | cut -d "/" -f 2- | rev | uniq | grep -v "^#")" + local _truefile="" + local _FileJson="$Tools4Dev_PATH/Utils/T4D-Plugin-VSCode/snippets/builtinst4d.json" + + + for _mainfile in $(echo $_mainFiles); do + if [ -f "${Tools4Dev_PATH}/${_mainfile}/_main_.env" ]; then + local _res="$(_t4dDocGetSectionContent "$(_t4dDocGetHeader -file "${Tools4Dev_PATH}/${_mainfile}/_main_.env" 2> /dev/null)" "Builtins" 2> /dev/null)" + fi + _res="$(_t4dVarCaseStyleConvert lower "$_res")" + if [[ "$_res" == "true" ]]; then + _truefile="$_truefile $_mainfile" + fi + done + + _truefile="$(echo $_truefile | sed "s|^ ||g" | sed "s|$Tools4Dev_PATH/||g" | sed "s/ /|/g" | sed "s|/_main_.env||g")" + + local _index="$(cat $Tools4Dev_PATH/.Ressources/index/private.index $Tools4Dev_PATH/.Ressources/index/public.index \ + | grep -v "^#" \ + | grep -E "$_truefile" \ + | cut -d":" -f2 )" + + + local _nbLine=$(echo $_index | wc -l) + local _i="1" + _t4dDebugLog $plog "generation of builtins t4d-VSCode" + echo "{" > _$FileJson + for _line in $(echo $_index); do + local _res="$(_t4dVarCaseStyleConvert lower. "$_line")" + echo " \"$_res\": {" >> $_FileJson + echo " \"prefix\": \"$_line\"," >> $_FileJson + echo " \"body\": \"$_line\"," >> $_FileJson + if [[ "$_i" == "$_nbLine" ]]; then + echo " }" >> $_FileJson + else + echo " }," >> $_FileJson + fi + _i=`expr $_i + 1` + done + echo "}" >> $_FileJson + +############################### +} diff --git a/Source/Aws/_main_.env b/Source/Aws/_main_.env index 465c122..68eea61 100644 --- a/Source/Aws/_main_.env +++ b/Source/Aws/_main_.env @@ -1,3 +1,16 @@ +#### PROJECT HEADER BLOC +# Generated From $Tools4Dev_PATH/Engine/G4d/templates-project.env +# v0.1 +# - Name: +# Source/Aws +### +# - Description: +# contains Api, Ec2, and Utils library +### +# - Builtins: +# True +### +#### HEADER BLOC #### source $T4D_SOURCE_PATH/Aws/aws-utils.env source $T4D_SOURCE_PATH/Aws/aws-api.env \ No newline at end of file From 0a0445a9f8e37837f5b02bcc890f56e25d247f86 Mon Sep 17 00:00:00 2001 From: Vincent Corallo Date: Mon, 13 Jun 2022 14:30:46 +0200 Subject: [PATCH 2/7] chore: add _t4dmakegeneratorvscodebuiltinslines --- Engine/Make/_main_.env | 50 +++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/Engine/Make/_main_.env b/Engine/Make/_main_.env index 3ef22de..6ceae59 100644 --- a/Engine/Make/_main_.env +++ b/Engine/Make/_main_.env @@ -522,23 +522,47 @@ _t4dMakeGeneratorVscodeBuiltins(){ | cut -d":" -f2 )" - local _nbLine=$(echo $_index | wc -l) - local _i="1" _t4dDebugLog $plog "generation of builtins t4d-VSCode" echo "{" > _$FileJson + for _line in $(echo $_index); do - local _res="$(_t4dVarCaseStyleConvert lower. "$_line")" - echo " \"$_res\": {" >> $_FileJson - echo " \"prefix\": \"$_line\"," >> $_FileJson - echo " \"body\": \"$_line\"," >> $_FileJson - if [[ "$_i" == "$_nbLine" ]]; then - echo " }" >> $_FileJson - else - echo " }," >> $_FileJson - fi - _i=`expr $_i + 1` + local _res="$(_t4dVarCaseStyleConvert lower.case "$_line")" + _t4dMakeGeneratorVscodeBuiltinsLines $_res $_line $_line >> $_FileJson done - echo "}" >> $_FileJson + echo "}" >> $_FileJson ############################### } + +_t4dMakeGeneratorVscodeBuiltinsLines(){ +# Generated From $Tools4Dev_PATH/Engine/G4d/templates-project.env +# v1.8.0 +###### _t4dMakeGeneratorVscodeBuiltinsLines +# - Name: +# _t4dMakeGeneratorVscodeBuiltinsLines +### +# - Synopsis: +# Generate builtins Line +### +# - Note: +# +# [Optionnal] +# {XXXXXXX} = Value To Be Changed, if {URL} then replace {URL} with a valid URL +### +###### DOCUMENTATION BLOC ##### +########### CODE BLOC ######### + +local _name="$1" +local _prefix="$2" +local _body="$3" + +cat << EOF + "$_name": { + "prefix": "$_line", + "body": "$_line", + }, +EOF + + +############################### +} \ No newline at end of file From b47aeb6c8a71bf48e64403c2b18649668fe22f44 Mon Sep 17 00:00:00 2001 From: Quentin NIO Date: Tue, 14 Jun 2022 11:14:24 +0200 Subject: [PATCH 3/7] chore: fix json validity --- Engine/Make/_main_.env | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Engine/Make/_main_.env b/Engine/Make/_main_.env index 6ceae59..3d0f1be 100644 --- a/Engine/Make/_main_.env +++ b/Engine/Make/_main_.env @@ -501,7 +501,9 @@ _t4dMakeGeneratorVscodeBuiltins(){ local _mainFiles="$(cat $Tools4Dev_PATH/.Ressources/index/private.index | cut -d ':' -f1 | rev | cut -d "/" -f 2- | rev | uniq | grep -v "^#")" local _truefile="" - local _FileJson="$Tools4Dev_PATH/Utils/T4D-Plugin-VSCode/snippets/builtinst4d.json" + local _FileJson="$1" + local _output="{" + # local _FileJson="$Tools4Dev_PATH/Utils/T4D-Plugin-VSCode/snippets/builtinst4d.json" for _mainfile in $(echo $_mainFiles); do @@ -523,13 +525,14 @@ _t4dMakeGeneratorVscodeBuiltins(){ _t4dDebugLog $plog "generation of builtins t4d-VSCode" - echo "{" > _$FileJson for _line in $(echo $_index); do + _t4dCheckInfo "$_res" local _res="$(_t4dVarCaseStyleConvert lower.case "$_line")" - _t4dMakeGeneratorVscodeBuiltinsLines $_res $_line $_line >> $_FileJson + _output="${_output},\n$(_t4dMakeGeneratorVscodeBuiltinsLines $_res $_line $_line)" done - echo "}" >> $_FileJson + + echo "${_output}\n}" | sed 's|{,|{|g' > $_FileJson ############################### } @@ -560,7 +563,7 @@ cat << EOF "$_name": { "prefix": "$_line", "body": "$_line", - }, + } EOF From eff59c5b5544fbe72c62b40d9567e576ae80d1f3 Mon Sep 17 00:00:00 2001 From: Vincent Corallo Date: Tue, 14 Jun 2022 13:30:58 +0200 Subject: [PATCH 4/7] chore: split main function --- .Ressources/Builtins/VSCode/Engine-Log.json | 274 ++++++++++++++++++++ .Ressources/Builtins/VSCode/Source-Aws.json | 74 ++++++ Engine/Documentation/_main_.env | 2 +- Engine/Log/_main_.env | 2 +- Engine/Make/_main_.env | 82 ++++-- Source/Aws/_main_.env | 2 +- 6 files changed, 405 insertions(+), 31 deletions(-) create mode 100644 .Ressources/Builtins/VSCode/Engine-Log.json create mode 100644 .Ressources/Builtins/VSCode/Source-Aws.json diff --git a/.Ressources/Builtins/VSCode/Engine-Log.json b/.Ressources/Builtins/VSCode/Engine-Log.json new file mode 100644 index 0000000..04b6cfe --- /dev/null +++ b/.Ressources/Builtins/VSCode/Engine-Log.json @@ -0,0 +1,274 @@ +{ + "t4d.src.aws.cp": { + "prefix": "_t4dSrcAwsCp", + "body": "_t4dSrcAwsCp", + }, + "t4d.src.aws.image.describe": { + "prefix": "_t4dSrcAwsImageDescribe", + "body": "_t4dSrcAwsImageDescribe", + }, + "t4d.src.aws.instance.all.list": { + "prefix": "_t4dSrcAwsInstanceAllList", + "body": "_t4dSrcAwsInstanceAllList", + }, + "t4d.src.aws.instance.get.status": { + "prefix": "_t4dSrcAwsInstanceGetStatus", + "body": "_t4dSrcAwsInstanceGetStatus", + }, + "t4d.src.aws.instance.list": { + "prefix": "_t4dSrcAwsInstanceList", + "body": "_t4dSrcAwsInstanceList", + }, + "t4d.src.aws.instance.querry": { + "prefix": "_t4dSrcAwsInstanceQuerry", + "body": "_t4dSrcAwsInstanceQuerry", + }, + "t4d.src.aws.instance.start": { + "prefix": "_t4dSrcAwsInstanceStart", + "body": "_t4dSrcAwsInstanceStart", + }, + "t4d.src.aws.instance.stop": { + "prefix": "_t4dSrcAwsInstanceStop", + "body": "_t4dSrcAwsInstanceStop", + }, + "t4d.src.aws.rm": { + "prefix": "_t4dSrcAwsRm", + "body": "_t4dSrcAwsRm", + }, + "t4d.src.aws.sub.net.describe": { + "prefix": "_t4dSrcAwsSubNetDescribe", + "body": "_t4dSrcAwsSubNetDescribe", + }, + "t4d.src.aws.check.credentials": { + "prefix": "_t4dSrcAwsCheckCredentials", + "body": "_t4dSrcAwsCheckCredentials", + }, + "t4d.src.aws.export.file": { + "prefix": "_t4dSrcAwsExportFile", + "body": "_t4dSrcAwsExportFile", + }, + "t4d.src.aws.import.file": { + "prefix": "_t4dSrcAwsImportFile", + "body": "_t4dSrcAwsImportFile", + }, + "t4d.src.aws.list": { + "prefix": "_t4dSrcAwsList", + "body": "_t4dSrcAwsList", + }, + "t4d.src.aws.list.buckets": { + "prefix": "_t4dSrcAwsListBuckets", + "body": "_t4dSrcAwsListBuckets", + }, + "t4d.src.aws.list.folder": { + "prefix": "_t4dSrcAwsListFolder", + "body": "_t4dSrcAwsListFolder", + }, + "t4d.src.aws.ping.main.name": { + "prefix": "_t4dSrcAwsPingMainName", + "body": "_t4dSrcAwsPingMainName", + }, + "t4d.src.aws.sync.status": { + "prefix": "_t4dSrcAwsSyncStatus", + "body": "_t4dSrcAwsSyncStatus", + }, + "t4d.check.binary": { + "prefix": "_t4dCheckBinary", + "body": "_t4dCheckBinary", + }, + "t4d.check.binary.version": { + "prefix": "_t4dCheckBinaryVersion", + "body": "_t4dCheckBinaryVersion", + }, + "t4d.check.command": { + "prefix": "_t4dCheckCommand", + "body": "_t4dCheckCommand", + }, + "t4d.check.env": { + "prefix": "_t4dCheckEnv", + "body": "_t4dCheckEnv", + }, + "t4d.check.failed": { + "prefix": "_t4dCheckFailed", + "body": "_t4dCheckFailed", + }, + "t4d.check.file": { + "prefix": "_t4dCheckFile", + "body": "_t4dCheckFile", + }, + "t4d.check.folder": { + "prefix": "_t4dCheckFolder", + "body": "_t4dCheckFolder", + }, + "t4d.check.folder.is.not.empty": { + "prefix": "_t4dCheckFolderIsNotEmpty", + "body": "_t4dCheckFolderIsNotEmpty", + }, + "t4d.check.function": { + "prefix": "_t4dCheckFunction", + "body": "_t4dCheckFunction", + }, + "t4d.check.info": { + "prefix": "_t4dCheckInfo", + "body": "_t4dCheckInfo", + }, + "t4d.check.osxapp": { + "prefix": "_t4dCheckOSXApp", + "body": "_t4dCheckOSXApp", + }, + "t4d.check.package": { + "prefix": "_t4dCheckPackage", + "body": "_t4dCheckPackage", + }, + "t4d.check.succeeded": { + "prefix": "_t4dCheckSucceeded", + "body": "_t4dCheckSucceeded", + }, + "t4d.check.sym.link": { + "prefix": "_t4dCheckSymLink", + "body": "_t4dCheckSymLink", + }, + "t4d.check.variable": { + "prefix": "_t4dCheckVariable", + "body": "_t4dCheckVariable", + }, + "t4d.check.version": { + "prefix": "_t4dCheckVersion", + "body": "_t4dCheckVersion", + }, + "t4d.check.warning": { + "prefix": "_t4dCheckWarning", + "body": "_t4dCheckWarning", + }, + "t4d.color.disabled": { + "prefix": "_t4dColorDisabled", + "body": "_t4dColorDisabled", + }, + "t4d.color.info": { + "prefix": "_t4dColorInfo", + "body": "_t4dColorInfo", + }, + "t4d.debug.log": { + "prefix": "_t4dDebugLog", + "body": "_t4dDebugLog", + }, + "t4d.prompt.ask.for.char": { + "prefix": "_t4dPromptAskForChar", + "body": "_t4dPromptAskForChar", + }, + "t4d.prompt.center.space": { + "prefix": "_t4dPromptCenterSpace", + "body": "_t4dPromptCenterSpace", + }, + "t4d.prompt.central.line": { + "prefix": "_t4dPromptCentralLine", + "body": "_t4dPromptCentralLine", + }, + "t4d.prompt.chart": { + "prefix": "_t4dPromptChart", + "body": "_t4dPromptChart", + }, + "t4d.prompt.col": { + "prefix": "_t4dPromptCol", + "body": "_t4dPromptCol", + }, + "t4d.prompt.echo.timer": { + "prefix": "_t4dPromptEchoTimer", + "body": "_t4dPromptEchoTimer", + }, + "t4d.prompt.empty.center": { + "prefix": "_t4dPromptEmptyCenter", + "body": "_t4dPromptEmptyCenter", + }, + "t4d.prompt.end.of.line": { + "prefix": "_t4dPromptEndOfLine", + "body": "_t4dPromptEndOfLine", + }, + "t4d.prompt.error": { + "prefix": "_t4dPromptError", + "body": "_t4dPromptError", + }, + "t4d.prompt.fixed.col": { + "prefix": "_t4dPromptFixedCol", + "body": "_t4dPromptFixedCol", + }, + "t4d.prompt.hyper.link": { + "prefix": "_t4dPromptHyperLink", + "body": "_t4dPromptHyperLink", + }, + "t4d.prompt.indent": { + "prefix": "_t4dPromptIndent", + "body": "_t4dPromptIndent", + }, + "t4d.prompt.info": { + "prefix": "_t4dPromptInfo", + "body": "_t4dPromptInfo", + }, + "t4d.prompt.in.progress": { + "prefix": "_t4dPromptInProgress", + "body": "_t4dPromptInProgress", + }, + "t4d.prompt.line": { + "prefix": "_t4dPromptLine", + "body": "_t4dPromptLine", + }, + "t4d.prompt.line.char": { + "prefix": "_t4dPromptLineChar", + "body": "_t4dPromptLineChar", + }, + "t4d.prompt.list.info": { + "prefix": "_t4dPromptListInfo", + "body": "_t4dPromptListInfo", + }, + "t4d.prompt.logo": { + "prefix": "_t4dPromptLogo", + "body": "_t4dPromptLogo", + }, + "t4d.prompt.object.center": { + "prefix": "_t4dPromptObjectCenter", + "body": "_t4dPromptObjectCenter", + }, + "t4d.prompt.object.end.of.line": { + "prefix": "_t4dPromptObjectEndOfLine", + "body": "_t4dPromptObjectEndOfLine", + }, + "t4d.prompt.size": { + "prefix": "_t4dPromptSize", + "body": "_t4dPromptSize", + }, + "t4d.prompt.square": { + "prefix": "_t4dPromptSquare", + "body": "_t4dPromptSquare", + }, + "t4d.prompt.table": { + "prefix": "_t4dPromptTable", + "body": "_t4dPromptTable", + }, + "t4d.prompt.var.center.with.char": { + "prefix": "_t4dPromptVarCenterWithChar", + "body": "_t4dPromptVarCenterWithChar", + }, + "t4d.prompt.var.with.char": { + "prefix": "_t4dPromptVarWithChar", + "body": "_t4dPromptVarWithChar", + }, + "t4d.prompt.var.with.space": { + "prefix": "_t4dPromptVarWithSpace", + "body": "_t4dPromptVarWithSpace", + }, + "t4d.prompt.var.with.space.at.end": { + "prefix": "_t4dPromptVarWithSpaceAtEnd", + "body": "_t4dPromptVarWithSpaceAtEnd", + }, + "t4d.prompt.workspace": { + "prefix": "_t4dPromptWorkspace", + "body": "_t4dPromptWorkspace", + }, + "t4d.src.prompt.demo": { + "prefix": "_t4dSrcPromptDemo", + "body": "_t4dSrcPromptDemo", + }, + "t4d.warning": { + "prefix": "_t4dWarning", + "body": "_t4dWarning", + } +} diff --git a/.Ressources/Builtins/VSCode/Source-Aws.json b/.Ressources/Builtins/VSCode/Source-Aws.json new file mode 100644 index 0000000..ce42da5 --- /dev/null +++ b/.Ressources/Builtins/VSCode/Source-Aws.json @@ -0,0 +1,74 @@ +{ + "t4d.src.aws.cp": { + "prefix": "_t4dSrcAwsCp", + "body": "_t4dSrcAwsCp", + }, + "t4d.src.aws.image.describe": { + "prefix": "_t4dSrcAwsImageDescribe", + "body": "_t4dSrcAwsImageDescribe", + }, + "t4d.src.aws.instance.all.list": { + "prefix": "_t4dSrcAwsInstanceAllList", + "body": "_t4dSrcAwsInstanceAllList", + }, + "t4d.src.aws.instance.get.status": { + "prefix": "_t4dSrcAwsInstanceGetStatus", + "body": "_t4dSrcAwsInstanceGetStatus", + }, + "t4d.src.aws.instance.list": { + "prefix": "_t4dSrcAwsInstanceList", + "body": "_t4dSrcAwsInstanceList", + }, + "t4d.src.aws.instance.querry": { + "prefix": "_t4dSrcAwsInstanceQuerry", + "body": "_t4dSrcAwsInstanceQuerry", + }, + "t4d.src.aws.instance.start": { + "prefix": "_t4dSrcAwsInstanceStart", + "body": "_t4dSrcAwsInstanceStart", + }, + "t4d.src.aws.instance.stop": { + "prefix": "_t4dSrcAwsInstanceStop", + "body": "_t4dSrcAwsInstanceStop", + }, + "t4d.src.aws.rm": { + "prefix": "_t4dSrcAwsRm", + "body": "_t4dSrcAwsRm", + }, + "t4d.src.aws.sub.net.describe": { + "prefix": "_t4dSrcAwsSubNetDescribe", + "body": "_t4dSrcAwsSubNetDescribe", + }, + "t4d.src.aws.check.credentials": { + "prefix": "_t4dSrcAwsCheckCredentials", + "body": "_t4dSrcAwsCheckCredentials", + }, + "t4d.src.aws.export.file": { + "prefix": "_t4dSrcAwsExportFile", + "body": "_t4dSrcAwsExportFile", + }, + "t4d.src.aws.import.file": { + "prefix": "_t4dSrcAwsImportFile", + "body": "_t4dSrcAwsImportFile", + }, + "t4d.src.aws.list": { + "prefix": "_t4dSrcAwsList", + "body": "_t4dSrcAwsList", + }, + "t4d.src.aws.list.buckets": { + "prefix": "_t4dSrcAwsListBuckets", + "body": "_t4dSrcAwsListBuckets", + }, + "t4d.src.aws.list.folder": { + "prefix": "_t4dSrcAwsListFolder", + "body": "_t4dSrcAwsListFolder", + }, + "t4d.src.aws.ping.main.name": { + "prefix": "_t4dSrcAwsPingMainName", + "body": "_t4dSrcAwsPingMainName", + }, + "t4d.src.aws.sync.status": { + "prefix": "_t4dSrcAwsSyncStatus", + "body": "_t4dSrcAwsSyncStatus", + } +} diff --git a/Engine/Documentation/_main_.env b/Engine/Documentation/_main_.env index 55f58cf..d3b39bf 100644 --- a/Engine/Documentation/_main_.env +++ b/Engine/Documentation/_main_.env @@ -347,7 +347,7 @@ _t4dDebugInfoStart "_t4dDocGetHeader" "$#" "$@" else local pathfile="$Tools4Dev_PATH/${2}" fi - _HeaderBloc="$(cat "$pathfile" | grep -A200 '#### MODULE HEADER BLOC' | grep -B200 '#### HEADER BLOC ####' || true )$(cat "$pathfile" | grep -A200 '#### PROJECT HEADER BLOC' | grep -B200 '#### HEADER BLOC ####' || true )" + _HeaderBloc="$(cat "$pathfile" | grep -A200 '#### MODULE HEADER BLOC' | grep -B200 '#### HEADER BLOC ####' || true )$(cat "$pathfile" | grep -A200 '#### PROJECT HEADER BLOC' | grep -B200 '#### HEADER BLOC ####' || true )$(cat "$pathfile" | grep -A200 '#### HEADER BLOC' | grep -B200 '#### HEADER BLOC ####' || true )" ;; -function) _HeaderBloc="$(_t4dDocGetFunctionContent "$2" "$3" | grep -A100 "#### $2" | grep -B100 '###### DOCUMENTATION BLOC #####')" diff --git a/Engine/Log/_main_.env b/Engine/Log/_main_.env index f9f1e4f..5b11617 100644 --- a/Engine/Log/_main_.env +++ b/Engine/Log/_main_.env @@ -1,4 +1,4 @@ -#### PROJECT HEADER BLOC +#### HEADER BLOC # Generated From $Tools4Dev_PATH/Engine/G4d/templates-project.env # v0.1 # - Name: diff --git a/Engine/Make/_main_.env b/Engine/Make/_main_.env index 3d0f1be..0e1da57 100644 --- a/Engine/Make/_main_.env +++ b/Engine/Make/_main_.env @@ -498,13 +498,56 @@ _t4dMakeGeneratorVscodeBuiltins(){ ###### DOCUMENTATION BLOC ##### ########### CODE BLOC ######### local _t4dErrorCode=1 - - local _mainFiles="$(cat $Tools4Dev_PATH/.Ressources/index/private.index | cut -d ':' -f1 | rev | cut -d "/" -f 2- | rev | uniq | grep -v "^#")" - local _truefile="" - local _FileJson="$1" + local _mainTrueFile="$1" + local _FileJsonPath="$Tools4Dev_PATH/.Ressources/Builtins/VSCode" local _output="{" - # local _FileJson="$Tools4Dev_PATH/Utils/T4D-Plugin-VSCode/snippets/builtinst4d.json" + local _index="$(cat $Tools4Dev_PATH/.Ressources/index/private.index $Tools4Dev_PATH/.Ressources/index/public.index | grep -v "^#" | grep -E "$_mainTrueFile" | cut -d":" -f2 )" + + local _res=$(echo $_mainTrueFile | sed "s|\|| |g") + _t4dDebugLog $plog "generation of builtins t4d-VSCode" + + for _truePath in $(echo $_res); do + local _index="$(cat $Tools4Dev_PATH/.Ressources/index/private.index $Tools4Dev_PATH/.Ressources/index/public.index | grep -v "^#" | grep -E "$_truePath" | cut -d":" -f2 )" + + for _line in $(echo $_index); do + _t4dCheckInfo "$_res" + local _res="$(_t4dVarCaseStyleConvert lower.case "$_line")" + _output="${_output},\n$(_t4dMakeGeneratorVscodeBuiltinsLines $_res $_line $_line)" + done + + local _fileName="$(echo $_truePath | sed "s|/|-|g" )" + local _FileJson="$_FileJsonPath/${_fileName}.json" + echo "${_output}\n}" | sed 's|{,|{|g' > $_FileJson + + done + + + + +############################### +} + +_t4dMakeGeneratorVscodeBuiltinsGetMain(){ +# Generated From $Tools4Dev_PATH/Engine/G4d/templates-project.env +# v1.8.0 +###### _t4dMakeGeneratorVscodeBuiltinsGetMain +# - Name: +# _t4dMakeGeneratorVscodeBuiltinsGetMain +### +# - Synopsis: +# Get main file with builtins true +### +# - Note: +# +# [Optionnal] +# {XXXXXXX} = Value To Be Changed, if {URL} then replace {URL} with a valid URL +### +###### DOCUMENTATION BLOC ##### +########### CODE BLOC ######### + local _t4dErrorCode=1 + local _mainFiles="$(cat $Tools4Dev_PATH/.Ressources/index/private.index | cut -d ':' -f1 | rev | cut -d "/" -f 2- | rev | uniq | grep -v "^#")" + local _mainTrueFile="" for _mainfile in $(echo $_mainFiles); do if [ -f "${Tools4Dev_PATH}/${_mainfile}/_main_.env" ]; then @@ -512,27 +555,11 @@ _t4dMakeGeneratorVscodeBuiltins(){ fi _res="$(_t4dVarCaseStyleConvert lower "$_res")" if [[ "$_res" == "true" ]]; then - _truefile="$_truefile $_mainfile" + _mainTrueFile="$_mainTrueFile $_mainfile" fi done - _truefile="$(echo $_truefile | sed "s|^ ||g" | sed "s|$Tools4Dev_PATH/||g" | sed "s/ /|/g" | sed "s|/_main_.env||g")" - - local _index="$(cat $Tools4Dev_PATH/.Ressources/index/private.index $Tools4Dev_PATH/.Ressources/index/public.index \ - | grep -v "^#" \ - | grep -E "$_truefile" \ - | cut -d":" -f2 )" - - - _t4dDebugLog $plog "generation of builtins t4d-VSCode" - - for _line in $(echo $_index); do - _t4dCheckInfo "$_res" - local _res="$(_t4dVarCaseStyleConvert lower.case "$_line")" - _output="${_output},\n$(_t4dMakeGeneratorVscodeBuiltinsLines $_res $_line $_line)" - done - - echo "${_output}\n}" | sed 's|{,|{|g' > $_FileJson + echo $_mainTrueFile | sed "s|^ ||g" | sed "s|$Tools4Dev_PATH/||g" | sed "s/ /|/g" | sed "s|/_main_.env||g" ############################### } @@ -554,10 +581,10 @@ _t4dMakeGeneratorVscodeBuiltinsLines(){ ### ###### DOCUMENTATION BLOC ##### ########### CODE BLOC ######### - -local _name="$1" -local _prefix="$2" -local _body="$3" + local _t4dErrorCode=1 + local _name="$1" + local _prefix="$2" + local _body="$3" cat << EOF "$_name": { @@ -566,6 +593,5 @@ cat << EOF } EOF - ############################### } \ No newline at end of file diff --git a/Source/Aws/_main_.env b/Source/Aws/_main_.env index 68eea61..1195b1a 100644 --- a/Source/Aws/_main_.env +++ b/Source/Aws/_main_.env @@ -1,4 +1,4 @@ -#### PROJECT HEADER BLOC +#### HEADER BLOC # Generated From $Tools4Dev_PATH/Engine/G4d/templates-project.env # v0.1 # - Name: From a4a24b7a9ec237f706110fff7d67d5fd1b269ab3 Mon Sep 17 00:00:00 2001 From: Vincent Corallo Date: Tue, 14 Jun 2022 13:34:57 +0200 Subject: [PATCH 5/7] chore: update t4dmake --- Source/_main_.env | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/_main_.env b/Source/_main_.env index 7a1c6be..7826335 100644 --- a/Source/_main_.env +++ b/Source/_main_.env @@ -115,6 +115,10 @@ _t4dDebugInfoStart "t4dMake" "$#" "$@" _t4dPromptSquare "Statistics" "$pblue" _t4dMakeStatistic fi + if [[ "$1" == "builtins" ]] || [[ "$1" == "" ]]; then + _t4dPromptSquare "builtins" "$pblue" + _t4dMakeGeneratorVscodeBuiltins + fi ############################### _t4dDebugInfoEnd "t4dMake" "$@" From e23373baaa00477ea910c9ad070322bffbd9fffb Mon Sep 17 00:00:00 2001 From: Vincent Corallo Date: Tue, 14 Jun 2022 13:42:44 +0200 Subject: [PATCH 6/7] chore: fix var name --- Engine/Make/_main_.env | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Engine/Make/_main_.env b/Engine/Make/_main_.env index 0e1da57..2823925 100644 --- a/Engine/Make/_main_.env +++ b/Engine/Make/_main_.env @@ -490,6 +490,10 @@ _t4dMakeGeneratorVscodeBuiltins(){ # - Synopsis: # Generate builtins when BuiltinsVSCode equals true in main file and add output file in Utils/T4D-Plugin-VSCode ### +# - Example: +# * _t4dMakeGeneratorVscodeBuiltins "$(_t4dMakeGeneratorVscodeBuiltinsGetMain)" +# +### # - Note: # # [Optionnal] @@ -502,18 +506,15 @@ _t4dMakeGeneratorVscodeBuiltins(){ local _FileJsonPath="$Tools4Dev_PATH/.Ressources/Builtins/VSCode" local _output="{" - local _index="$(cat $Tools4Dev_PATH/.Ressources/index/private.index $Tools4Dev_PATH/.Ressources/index/public.index | grep -v "^#" | grep -E "$_mainTrueFile" | cut -d":" -f2 )" - - local _res=$(echo $_mainTrueFile | sed "s|\|| |g") _t4dDebugLog $plog "generation of builtins t4d-VSCode" - for _truePath in $(echo $_res); do + for _truePath in $(echo $_mainTrueFile); do local _index="$(cat $Tools4Dev_PATH/.Ressources/index/private.index $Tools4Dev_PATH/.Ressources/index/public.index | grep -v "^#" | grep -E "$_truePath" | cut -d":" -f2 )" - for _line in $(echo $_index); do + for _FunctionName in $(echo $_index); do + local _res="$(_t4dVarCaseStyleConvert lower.case "$_FunctionName")" _t4dCheckInfo "$_res" - local _res="$(_t4dVarCaseStyleConvert lower.case "$_line")" - _output="${_output},\n$(_t4dMakeGeneratorVscodeBuiltinsLines $_res $_line $_line)" + _output="${_output},\n$(_t4dMakeGeneratorVscodeBuiltinsLines $_res $_FunctionName $_FunctionName)" done local _fileName="$(echo $_truePath | sed "s|/|-|g" )" @@ -522,6 +523,8 @@ _t4dMakeGeneratorVscodeBuiltins(){ done + _t4dDebugLog $plog "save in $_FileJsonPath" + @@ -559,7 +562,7 @@ _t4dMakeGeneratorVscodeBuiltinsGetMain(){ fi done - echo $_mainTrueFile | sed "s|^ ||g" | sed "s|$Tools4Dev_PATH/||g" | sed "s/ /|/g" | sed "s|/_main_.env||g" + echo $_mainTrueFile | sed "s|^ ||g" | sed "s|$Tools4Dev_PATH/||g" | sed "s/ /\n/g" | sed "s|/_main_.env||g" ############################### } From 61602b031b072aa9b62cdce1f8e95cb8a5aed2bd Mon Sep 17 00:00:00 2001 From: Vincent Corallo Date: Tue, 28 Jun 2022 16:43:17 +0200 Subject: [PATCH 7/7] chore: split private public --- .Ressources/Builtins/VSCode/Source-Aws.json | 74 ---------- .../VSCode/{Engine-Log.json => private.json} | 136 +++++++++--------- .Ressources/Builtins/VSCode/public.json | 2 + .Ressources/Builtins/VSCode/var.json | 10 ++ Engine/Make/_main_.env | 74 ++++++++-- 5 files changed, 141 insertions(+), 155 deletions(-) delete mode 100644 .Ressources/Builtins/VSCode/Source-Aws.json rename .Ressources/Builtins/VSCode/{Engine-Log.json => private.json} (73%) create mode 100644 .Ressources/Builtins/VSCode/public.json create mode 100644 .Ressources/Builtins/VSCode/var.json diff --git a/.Ressources/Builtins/VSCode/Source-Aws.json b/.Ressources/Builtins/VSCode/Source-Aws.json deleted file mode 100644 index ce42da5..0000000 --- a/.Ressources/Builtins/VSCode/Source-Aws.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "t4d.src.aws.cp": { - "prefix": "_t4dSrcAwsCp", - "body": "_t4dSrcAwsCp", - }, - "t4d.src.aws.image.describe": { - "prefix": "_t4dSrcAwsImageDescribe", - "body": "_t4dSrcAwsImageDescribe", - }, - "t4d.src.aws.instance.all.list": { - "prefix": "_t4dSrcAwsInstanceAllList", - "body": "_t4dSrcAwsInstanceAllList", - }, - "t4d.src.aws.instance.get.status": { - "prefix": "_t4dSrcAwsInstanceGetStatus", - "body": "_t4dSrcAwsInstanceGetStatus", - }, - "t4d.src.aws.instance.list": { - "prefix": "_t4dSrcAwsInstanceList", - "body": "_t4dSrcAwsInstanceList", - }, - "t4d.src.aws.instance.querry": { - "prefix": "_t4dSrcAwsInstanceQuerry", - "body": "_t4dSrcAwsInstanceQuerry", - }, - "t4d.src.aws.instance.start": { - "prefix": "_t4dSrcAwsInstanceStart", - "body": "_t4dSrcAwsInstanceStart", - }, - "t4d.src.aws.instance.stop": { - "prefix": "_t4dSrcAwsInstanceStop", - "body": "_t4dSrcAwsInstanceStop", - }, - "t4d.src.aws.rm": { - "prefix": "_t4dSrcAwsRm", - "body": "_t4dSrcAwsRm", - }, - "t4d.src.aws.sub.net.describe": { - "prefix": "_t4dSrcAwsSubNetDescribe", - "body": "_t4dSrcAwsSubNetDescribe", - }, - "t4d.src.aws.check.credentials": { - "prefix": "_t4dSrcAwsCheckCredentials", - "body": "_t4dSrcAwsCheckCredentials", - }, - "t4d.src.aws.export.file": { - "prefix": "_t4dSrcAwsExportFile", - "body": "_t4dSrcAwsExportFile", - }, - "t4d.src.aws.import.file": { - "prefix": "_t4dSrcAwsImportFile", - "body": "_t4dSrcAwsImportFile", - }, - "t4d.src.aws.list": { - "prefix": "_t4dSrcAwsList", - "body": "_t4dSrcAwsList", - }, - "t4d.src.aws.list.buckets": { - "prefix": "_t4dSrcAwsListBuckets", - "body": "_t4dSrcAwsListBuckets", - }, - "t4d.src.aws.list.folder": { - "prefix": "_t4dSrcAwsListFolder", - "body": "_t4dSrcAwsListFolder", - }, - "t4d.src.aws.ping.main.name": { - "prefix": "_t4dSrcAwsPingMainName", - "body": "_t4dSrcAwsPingMainName", - }, - "t4d.src.aws.sync.status": { - "prefix": "_t4dSrcAwsSyncStatus", - "body": "_t4dSrcAwsSyncStatus", - } -} diff --git a/.Ressources/Builtins/VSCode/Engine-Log.json b/.Ressources/Builtins/VSCode/private.json similarity index 73% rename from .Ressources/Builtins/VSCode/Engine-Log.json rename to .Ressources/Builtins/VSCode/private.json index 04b6cfe..5aef4a3 100644 --- a/.Ressources/Builtins/VSCode/Engine-Log.json +++ b/.Ressources/Builtins/VSCode/private.json @@ -1,273 +1,273 @@ { - "t4d.src.aws.cp": { + "_t4dSrcAwsCp": { "prefix": "_t4dSrcAwsCp", "body": "_t4dSrcAwsCp", }, - "t4d.src.aws.image.describe": { + "_t4dSrcAwsImageDescribe": { "prefix": "_t4dSrcAwsImageDescribe", "body": "_t4dSrcAwsImageDescribe", }, - "t4d.src.aws.instance.all.list": { + "_t4dSrcAwsInstanceAllList": { "prefix": "_t4dSrcAwsInstanceAllList", "body": "_t4dSrcAwsInstanceAllList", }, - "t4d.src.aws.instance.get.status": { + "_t4dSrcAwsInstanceGetStatus": { "prefix": "_t4dSrcAwsInstanceGetStatus", "body": "_t4dSrcAwsInstanceGetStatus", }, - "t4d.src.aws.instance.list": { + "_t4dSrcAwsInstanceList": { "prefix": "_t4dSrcAwsInstanceList", "body": "_t4dSrcAwsInstanceList", }, - "t4d.src.aws.instance.querry": { + "_t4dSrcAwsInstanceQuerry": { "prefix": "_t4dSrcAwsInstanceQuerry", "body": "_t4dSrcAwsInstanceQuerry", }, - "t4d.src.aws.instance.start": { + "_t4dSrcAwsInstanceStart": { "prefix": "_t4dSrcAwsInstanceStart", "body": "_t4dSrcAwsInstanceStart", }, - "t4d.src.aws.instance.stop": { + "_t4dSrcAwsInstanceStop": { "prefix": "_t4dSrcAwsInstanceStop", "body": "_t4dSrcAwsInstanceStop", }, - "t4d.src.aws.rm": { + "_t4dSrcAwsRm": { "prefix": "_t4dSrcAwsRm", "body": "_t4dSrcAwsRm", }, - "t4d.src.aws.sub.net.describe": { + "_t4dSrcAwsSubNetDescribe": { "prefix": "_t4dSrcAwsSubNetDescribe", "body": "_t4dSrcAwsSubNetDescribe", }, - "t4d.src.aws.check.credentials": { + "_t4dSrcAwsCheckCredentials": { "prefix": "_t4dSrcAwsCheckCredentials", "body": "_t4dSrcAwsCheckCredentials", }, - "t4d.src.aws.export.file": { + "_t4dSrcAwsExportFile": { "prefix": "_t4dSrcAwsExportFile", "body": "_t4dSrcAwsExportFile", }, - "t4d.src.aws.import.file": { + "_t4dSrcAwsImportFile": { "prefix": "_t4dSrcAwsImportFile", "body": "_t4dSrcAwsImportFile", }, - "t4d.src.aws.list": { + "_t4dSrcAwsList": { "prefix": "_t4dSrcAwsList", "body": "_t4dSrcAwsList", }, - "t4d.src.aws.list.buckets": { + "_t4dSrcAwsListBuckets": { "prefix": "_t4dSrcAwsListBuckets", "body": "_t4dSrcAwsListBuckets", }, - "t4d.src.aws.list.folder": { + "_t4dSrcAwsListFolder": { "prefix": "_t4dSrcAwsListFolder", "body": "_t4dSrcAwsListFolder", }, - "t4d.src.aws.ping.main.name": { + "_t4dSrcAwsPingMainName": { "prefix": "_t4dSrcAwsPingMainName", "body": "_t4dSrcAwsPingMainName", }, - "t4d.src.aws.sync.status": { + "_t4dSrcAwsSyncStatus": { "prefix": "_t4dSrcAwsSyncStatus", "body": "_t4dSrcAwsSyncStatus", }, - "t4d.check.binary": { + "_t4dCheckBinary": { "prefix": "_t4dCheckBinary", "body": "_t4dCheckBinary", }, - "t4d.check.binary.version": { + "_t4dCheckBinaryVersion": { "prefix": "_t4dCheckBinaryVersion", "body": "_t4dCheckBinaryVersion", }, - "t4d.check.command": { + "_t4dCheckCommand": { "prefix": "_t4dCheckCommand", "body": "_t4dCheckCommand", }, - "t4d.check.env": { + "_t4dCheckEnv": { "prefix": "_t4dCheckEnv", "body": "_t4dCheckEnv", }, - "t4d.check.failed": { + "_t4dCheckFailed": { "prefix": "_t4dCheckFailed", "body": "_t4dCheckFailed", }, - "t4d.check.file": { + "_t4dCheckFile": { "prefix": "_t4dCheckFile", "body": "_t4dCheckFile", }, - "t4d.check.folder": { + "_t4dCheckFolder": { "prefix": "_t4dCheckFolder", "body": "_t4dCheckFolder", }, - "t4d.check.folder.is.not.empty": { + "_t4dCheckFolderIsNotEmpty": { "prefix": "_t4dCheckFolderIsNotEmpty", "body": "_t4dCheckFolderIsNotEmpty", }, - "t4d.check.function": { + "_t4dCheckFunction": { "prefix": "_t4dCheckFunction", "body": "_t4dCheckFunction", }, - "t4d.check.info": { + "_t4dCheckInfo": { "prefix": "_t4dCheckInfo", "body": "_t4dCheckInfo", }, - "t4d.check.osxapp": { + "_t4dCheckOSXApp": { "prefix": "_t4dCheckOSXApp", "body": "_t4dCheckOSXApp", }, - "t4d.check.package": { + "_t4dCheckPackage": { "prefix": "_t4dCheckPackage", "body": "_t4dCheckPackage", }, - "t4d.check.succeeded": { + "_t4dCheckSucceeded": { "prefix": "_t4dCheckSucceeded", "body": "_t4dCheckSucceeded", }, - "t4d.check.sym.link": { + "_t4dCheckSymLink": { "prefix": "_t4dCheckSymLink", "body": "_t4dCheckSymLink", }, - "t4d.check.variable": { + "_t4dCheckVariable": { "prefix": "_t4dCheckVariable", "body": "_t4dCheckVariable", }, - "t4d.check.version": { + "_t4dCheckVersion": { "prefix": "_t4dCheckVersion", "body": "_t4dCheckVersion", }, - "t4d.check.warning": { + "_t4dCheckWarning": { "prefix": "_t4dCheckWarning", "body": "_t4dCheckWarning", }, - "t4d.color.disabled": { + "_t4dColorDisabled": { "prefix": "_t4dColorDisabled", "body": "_t4dColorDisabled", }, - "t4d.color.info": { + "_t4dColorInfo": { "prefix": "_t4dColorInfo", "body": "_t4dColorInfo", }, - "t4d.debug.log": { + "_t4dDebugLog": { "prefix": "_t4dDebugLog", "body": "_t4dDebugLog", }, - "t4d.prompt.ask.for.char": { + "_t4dPromptAskForChar": { "prefix": "_t4dPromptAskForChar", "body": "_t4dPromptAskForChar", }, - "t4d.prompt.center.space": { + "_t4dPromptCenterSpace": { "prefix": "_t4dPromptCenterSpace", "body": "_t4dPromptCenterSpace", }, - "t4d.prompt.central.line": { + "_t4dPromptCentralLine": { "prefix": "_t4dPromptCentralLine", "body": "_t4dPromptCentralLine", }, - "t4d.prompt.chart": { + "_t4dPromptChart": { "prefix": "_t4dPromptChart", "body": "_t4dPromptChart", }, - "t4d.prompt.col": { + "_t4dPromptCol": { "prefix": "_t4dPromptCol", "body": "_t4dPromptCol", }, - "t4d.prompt.echo.timer": { + "_t4dPromptEchoTimer": { "prefix": "_t4dPromptEchoTimer", "body": "_t4dPromptEchoTimer", }, - "t4d.prompt.empty.center": { + "_t4dPromptEmptyCenter": { "prefix": "_t4dPromptEmptyCenter", "body": "_t4dPromptEmptyCenter", }, - "t4d.prompt.end.of.line": { + "_t4dPromptEndOfLine": { "prefix": "_t4dPromptEndOfLine", "body": "_t4dPromptEndOfLine", }, - "t4d.prompt.error": { + "_t4dPromptError": { "prefix": "_t4dPromptError", "body": "_t4dPromptError", }, - "t4d.prompt.fixed.col": { + "_t4dPromptFixedCol": { "prefix": "_t4dPromptFixedCol", "body": "_t4dPromptFixedCol", }, - "t4d.prompt.hyper.link": { + "_t4dPromptHyperLink": { "prefix": "_t4dPromptHyperLink", "body": "_t4dPromptHyperLink", }, - "t4d.prompt.indent": { + "_t4dPromptIndent": { "prefix": "_t4dPromptIndent", "body": "_t4dPromptIndent", }, - "t4d.prompt.info": { + "_t4dPromptInfo": { "prefix": "_t4dPromptInfo", "body": "_t4dPromptInfo", }, - "t4d.prompt.in.progress": { + "_t4dPromptInProgress": { "prefix": "_t4dPromptInProgress", "body": "_t4dPromptInProgress", }, - "t4d.prompt.line": { + "_t4dPromptLine": { "prefix": "_t4dPromptLine", "body": "_t4dPromptLine", }, - "t4d.prompt.line.char": { + "_t4dPromptLineChar": { "prefix": "_t4dPromptLineChar", "body": "_t4dPromptLineChar", }, - "t4d.prompt.list.info": { + "_t4dPromptListInfo": { "prefix": "_t4dPromptListInfo", "body": "_t4dPromptListInfo", }, - "t4d.prompt.logo": { + "_t4dPromptLogo": { "prefix": "_t4dPromptLogo", "body": "_t4dPromptLogo", }, - "t4d.prompt.object.center": { + "_t4dPromptObjectCenter": { "prefix": "_t4dPromptObjectCenter", "body": "_t4dPromptObjectCenter", }, - "t4d.prompt.object.end.of.line": { + "_t4dPromptObjectEndOfLine": { "prefix": "_t4dPromptObjectEndOfLine", "body": "_t4dPromptObjectEndOfLine", }, - "t4d.prompt.size": { + "_t4dPromptSize": { "prefix": "_t4dPromptSize", "body": "_t4dPromptSize", }, - "t4d.prompt.square": { + "_t4dPromptSquare": { "prefix": "_t4dPromptSquare", "body": "_t4dPromptSquare", }, - "t4d.prompt.table": { + "_t4dPromptTable": { "prefix": "_t4dPromptTable", "body": "_t4dPromptTable", }, - "t4d.prompt.var.center.with.char": { + "_t4dPromptVarCenterWithChar": { "prefix": "_t4dPromptVarCenterWithChar", "body": "_t4dPromptVarCenterWithChar", }, - "t4d.prompt.var.with.char": { + "_t4dPromptVarWithChar": { "prefix": "_t4dPromptVarWithChar", "body": "_t4dPromptVarWithChar", }, - "t4d.prompt.var.with.space": { + "_t4dPromptVarWithSpace": { "prefix": "_t4dPromptVarWithSpace", "body": "_t4dPromptVarWithSpace", }, - "t4d.prompt.var.with.space.at.end": { + "_t4dPromptVarWithSpaceAtEnd": { "prefix": "_t4dPromptVarWithSpaceAtEnd", "body": "_t4dPromptVarWithSpaceAtEnd", }, - "t4d.prompt.workspace": { + "_t4dPromptWorkspace": { "prefix": "_t4dPromptWorkspace", "body": "_t4dPromptWorkspace", }, - "t4d.src.prompt.demo": { + "_t4dSrcPromptDemo": { "prefix": "_t4dSrcPromptDemo", "body": "_t4dSrcPromptDemo", }, - "t4d.warning": { + "_t4dWarning": { "prefix": "_t4dWarning", "body": "_t4dWarning", } diff --git a/.Ressources/Builtins/VSCode/public.json b/.Ressources/Builtins/VSCode/public.json new file mode 100644 index 0000000..2c63c08 --- /dev/null +++ b/.Ressources/Builtins/VSCode/public.json @@ -0,0 +1,2 @@ +{ +} diff --git a/.Ressources/Builtins/VSCode/var.json b/.Ressources/Builtins/VSCode/var.json new file mode 100644 index 0000000..2ee17aa --- /dev/null +++ b/.Ressources/Builtins/VSCode/var.json @@ -0,0 +1,10 @@ +{ + "Tools4Dev_PATH": { + "prefix": "Tools4Dev_PATH", + "body": "Tools4Dev_PATH", + }, + "WS_ROOT": { + "prefix": "WS_ROOT", + "body": "WS_ROOT", + } +} \ No newline at end of file diff --git a/Engine/Make/_main_.env b/Engine/Make/_main_.env index 2823925..7a7812a 100644 --- a/Engine/Make/_main_.env +++ b/Engine/Make/_main_.env @@ -504,30 +504,78 @@ _t4dMakeGeneratorVscodeBuiltins(){ local _t4dErrorCode=1 local _mainTrueFile="$1" local _FileJsonPath="$Tools4Dev_PATH/.Ressources/Builtins/VSCode" - local _output="{" + + local _outputPublic="{" + local _outputPrivate="{" + local _outputDoc="{" + _t4dDebugLog $plog "generation of builtins t4d-VSCode" + for _truePath in $(echo $_mainTrueFile); do - local _index="$(cat $Tools4Dev_PATH/.Ressources/index/private.index $Tools4Dev_PATH/.Ressources/index/public.index | grep -v "^#" | grep -E "$_truePath" | cut -d":" -f2 )" + local _indexPublic="$(cat $Tools4Dev_PATH/.Ressources/index/public.index | grep -v "^#" | grep -E "$_truePath" | cut -d":" -f2 )" + local _indexPrivate="$(cat $Tools4Dev_PATH/.Ressources/index/private.index | grep -v "^#" | grep -E "$_truePath" | cut -d":" -f2 )" - for _FunctionName in $(echo $_index); do - local _res="$(_t4dVarCaseStyleConvert lower.case "$_FunctionName")" - _t4dCheckInfo "$_res" - _output="${_output},\n$(_t4dMakeGeneratorVscodeBuiltinsLines $_res $_FunctionName $_FunctionName)" + for _FunctionNamePublic in $(echo $_indexPublic); do + _t4dCheckInfo "$_FunctionNamePublic" + _outputPublic="${_outputPublic},\n$(_t4dMakeGeneratorVscodeBuiltinsLines $_FunctionNamePublic $_FunctionNamePublic $_FunctionNamePublic)" done - local _fileName="$(echo $_truePath | sed "s|/|-|g" )" - local _FileJson="$_FileJsonPath/${_fileName}.json" - echo "${_output}\n}" | sed 's|{,|{|g' > $_FileJson - + for _FunctionNamePrivate in $(echo $_indexPrivate); do + _t4dCheckInfo "$_FunctionNamePrivate" + _outputPrivate="${_outputPrivate},\n$(_t4dMakeGeneratorVscodeBuiltinsLines $_FunctionNamePrivate $_FunctionNamePrivate $_FunctionNamePrivate)" + done done + local _FileJson="$_FileJsonPath/private.json" + echo "${_outputPrivate}\n}" | sed 's|{,|{|g' > $_FileJson + + local _FileJson="$_FileJsonPath/public.json" + echo "${_outputPublic}\n}" | sed 's|{,|{|g' > $_FileJson + + + + + + _t4dDebugLog $plog "save in $_FileJsonPath" - +############################### +} + +_t4dMakeGeneratorVscodeBuiltinsGetChf(){ +# Generated From $Tools4Dev_PATH/Engine/G4d/templates-project.env +# v1.8.0 +###### _t4dMakeGeneratorVscodeBuiltinsGetChf +# - Name: +# _t4dMakeGeneratorVscodeBuiltinsGetChf +### +# - Synopsis: +# Generate Builtins for chf +### +# - Note: +# +# [Optionnal] +# {XXXXXXX} = Value To Be Changed, if {URL} then replace {URL} with a valid URL +### +###### DOCUMENTATION BLOC ##### +########### CODE BLOC ######### + local _t4dErrorCode=1 + local _command="$(chf -title "_\${1:name}" -synopsis "\${2:description}" | sed "s|local _t4dErrorCode=1|local _t4dErrorCode=1\n \${0}|g")" + + echo ' "chf" : {' + echo ' "prefix": "chf",' + echo ' "body" :[' + echo $_command | while read _line ; do + echo " \"$_line\"," | sed 's|"}",|"}"|g' + done + echo ' ],' + echo ' "description": "t4d function generator"' + echo ' },' + ############################### } @@ -591,8 +639,8 @@ _t4dMakeGeneratorVscodeBuiltinsLines(){ cat << EOF "$_name": { - "prefix": "$_line", - "body": "$_line", + "prefix": "$_prefix", + "body": "$_body", } EOF