Support excluding files in TOML (#370)

Author: Xcodo

README.md

@@ -157,12 +157,15 @@ lib1.files = [
     'tb_ent.vhd'
 ]
 
-# Wildcards are supported
+# Wildcards and exclude patterns are supported
 lib3.files = [
     'test/*.vhd',
     'src/*.vhd',
     'src/*/*.vhd',
 ]
+lib3.exclude = [
+    'test/*_old.vhd',
+]
 
 # Libraries can be marked as third-party to disable some analysis warnings, such as unused declarations
 UNISIM.files = [

example_project/vhdl_ls.toml

@@ -1,201 +1,20 @@
 [libraries]
 
 vunit_lib.files = [
-    "vunit/vunit/vhdl/check/src/check_api.vhd",
-    "vunit/vunit/vhdl/check/src/check.vhd",
-    "vunit/vunit/vhdl/check/src/checker_pkg-body.vhd",
-    "vunit/vunit/vhdl/check/src/checker_pkg.vhd",
-    "vunit/vunit/vhdl/com/src/com_api.vhd",
-    "vunit/vunit/vhdl/com/src/com_common.vhd",
-    "vunit/vunit/vhdl/com/src/com_context.vhd",
-    "vunit/vunit/vhdl/com/src/com_debug_codec_builder.vhd",
-    "vunit/vunit/vhdl/com/src/com_deprecated.vhd",
-    "vunit/vunit/vhdl/com/src/com_messenger.vhd",
-    "vunit/vunit/vhdl/com/src/com_string.vhd",
-    "vunit/vunit/vhdl/com/src/com_support.vhd",
-    "vunit/vunit/vhdl/com/src/com_types.vhd",
-    "vunit/vunit/vhdl/com/src/com.vhd",
-    "vunit/vunit/vhdl/core/src/core_pkg.vhd",
-    "vunit/vunit/vhdl/core/src/stop_body_2008p.vhd",
-    "vunit/vunit/vhdl/core/src/stop_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/api/external_integer_vector_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/api/external_string_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/byte_vector_ptr_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/codec_builder-2008p.vhd",
-    "vunit/vunit/vhdl/data_types/src/codec_builder.vhd",
-    "vunit/vunit/vhdl/data_types/src/codec-2008p.vhd",
-    "vunit/vunit/vhdl/data_types/src/codec.vhd",
-    "vunit/vunit/vhdl/data_types/src/data_types_context.vhd",
-    "vunit/vunit/vhdl/data_types/src/data_types_private_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/dict_pkg-2008p.vhd",
-    "vunit/vunit/vhdl/data_types/src/dict_pkg-body.vhd",
-    "vunit/vunit/vhdl/data_types/src/dict_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/id_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/integer_array_pkg-body.vhd",
-    "vunit/vunit/vhdl/data_types/src/integer_array_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/integer_vector_ptr_pkg-body-2002p.vhd",
-    "vunit/vunit/vhdl/data_types/src/integer_vector_ptr_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/integer_vector_ptr_pool_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/queue_pkg-2008p.vhd",
-    "vunit/vunit/vhdl/data_types/src/queue_pkg-body.vhd",
-    "vunit/vunit/vhdl/data_types/src/queue_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/queue_pool_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/string_ptr_pkg-body-2002p.vhd",
-    "vunit/vunit/vhdl/data_types/src/string_ptr_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/string_ptr_pool_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/types.vhd",
-    "vunit/vunit/vhdl/data_types/src/event_common_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/event_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/src/event_private_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/test/tb_event_pkg.vhd",
-    "vunit/vunit/vhdl/data_types/test/tb_event_private_pkg.vhd",
-    "vunit/vunit/vhdl/dictionary/src/dictionary.vhd",
-    "vunit/vunit/vhdl/logging/src/common_log_pkg.vhd",
-    "vunit/vunit/vhdl/logging/src/common_log_pkg-body.vhd",
-    "vunit/vunit/vhdl/logging/src/ansi_pkg.vhd",
-    "vunit/vunit/vhdl/logging/src/file_pkg.vhd",
-    "vunit/vunit/vhdl/logging/src/location_pkg-body-2008m.vhd",
-    "vunit/vunit/vhdl/logging/src/location_pkg.vhd",
-    "vunit/vunit/vhdl/logging/src/log_handler_pkg-body.vhd",
-    "vunit/vunit/vhdl/logging/src/log_handler_pkg.vhd",
-    "vunit/vunit/vhdl/logging/src/log_levels_pkg-body.vhd",
-    "vunit/vunit/vhdl/logging/src/log_levels_pkg.vhd",
-    "vunit/vunit/vhdl/logging/src/logger_pkg-body.vhd",
-    "vunit/vunit/vhdl/logging/src/logger_pkg.vhd",
-    "vunit/vunit/vhdl/logging/src/print_pkg-body.vhd",
-    "vunit/vunit/vhdl/logging/src/print_pkg.vhd",
-    "vunit/vunit/vhdl/path/src/path.vhd",
-    "vunit/vunit/vhdl/run/src/run_api.vhd",
-    "vunit/vunit/vhdl/run/src/run_types.vhd",
-    "vunit/vunit/vhdl/run/src/run.vhd",
-    "vunit/vunit/vhdl/run/src/runner_pkg.vhd",
-    "vunit/vunit/vhdl/string_ops/src/string_ops.vhd",
-    "vunit/vunit/vhdl/verification_components/src/avalon_master.vhd",
-    "vunit/vunit/vhdl/verification_components/src/avalon_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/avalon_sink.vhd",
-    "vunit/vunit/vhdl/verification_components/src/avalon_slave.vhd",
-    "vunit/vunit/vhdl/verification_components/src/avalon_source.vhd",
-    "vunit/vunit/vhdl/verification_components/src/avalon_stream_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_lite_master_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_lite_master.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_read_slave.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_slave_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_slave_private_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_statistics_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_stream_master.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_stream_monitor.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_stream_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_stream_private_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_stream_protocol_checker.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_stream_slave.vhd",
-    "vunit/vunit/vhdl/verification_components/src/axi_write_slave.vhd",
-    "vunit/vunit/vhdl/verification_components/src/bus_master_pkg-body.vhd",
-    "vunit/vunit/vhdl/verification_components/src/bus_master_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/bus2memory.vhd",
-    "vunit/vunit/vhdl/verification_components/src/memory_pkg-body.vhd",
-    "vunit/vunit/vhdl/verification_components/src/memory_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/memory_utils_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/ram_master.vhd",
-    "vunit/vunit/vhdl/verification_components/src/signal_checker_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/std_logic_checker.vhd",
-    "vunit/vunit/vhdl/verification_components/src/stream_master_pkg-body.vhd",
-    "vunit/vunit/vhdl/verification_components/src/stream_master_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/stream_slave_pkg-body.vhd",
-    "vunit/vunit/vhdl/verification_components/src/stream_slave_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/sync_pkg-body.vhd",
-    "vunit/vunit/vhdl/verification_components/src/sync_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/uart_master.vhd",
-    "vunit/vunit/vhdl/verification_components/src/uart_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/uart_slave.vhd",
-    "vunit/vunit/vhdl/verification_components/src/vc_context.vhd",
-    "vunit/vunit/vhdl/verification_components/src/wishbone_master.vhd",
-    "vunit/vunit/vhdl/verification_components/src/wishbone_pkg.vhd",
-    "vunit/vunit/vhdl/verification_components/src/wishbone_slave.vhd",
-    "vunit/vunit/vhdl/vunit_context.vhd",
-    "vunit/vunit/vhdl/vunit_run_context.vhd",
-    "vunit/vunit/vhdl/random/src/random_pkg.vhd",
-
-    # Also add tests
-    'vunit/vunit/vhdl/run/test/*.vhd',
-    'vunit/vunit/vhdl/logging/test/*.vhd',
-    'vunit/vunit/vhdl/string_ops/test/*.vhd',
-    'vunit/vunit/vhdl/run/test/*.vhd',
-
-    'vunit/vunit/vhdl/check/test/tb_checker.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_next.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_relation_2008p.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_stable.vhd',
-    'vunit/vunit/vhdl/check/test/test_support.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_passed.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_failed.vhd',
-    #'vunit/vunit/vhdl/check/test/tb_deprecated.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_implication.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_sequence.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_zero_one_hot.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_equal_real.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_one_hot.vhd',
-    'vunit/vunit/vhdl/check/test/tb_result.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_not_unknown.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_false.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check_relation.vhd',
-    'vunit/vunit/vhdl/check/test/tb_check.vhd',
-
-    'vunit/vunit/vhdl/verification_components/test/*.vhd',
-
-    'vunit/vunit/vhdl/data_types/test/*.vhd',
-
-
-    'vunit/vunit/vhdl/path/test/*.vhd',
-
-    'vunit/vunit/vhdl/com/test/constants.vhd',
-    'vunit/vunit/vhdl/com/test/more_constants.vhd',
-    #'vunit/vunit/vhdl/com/test/tb_com_codec.vhd',
-    'vunit/vunit/vhdl/com/test/custom_types.vhd',
-    'vunit/vunit/vhdl/com/test/tb_com_msg_building.vhd',
-    'vunit/vunit/vhdl/com/test/tb_com_deprecated.vhd',
-    'vunit/vunit/vhdl/com/test/tb_com.vhd',
-
-    'vunit/vunit/vhdl/dictionary/test/*.vhd',
+    "vunit/vunit/vhdl/**/*.vhd",
+]
+vunit_lib.exclude = [
+    "vunit/vunit/vhdl/**/*93*",
+    "vunit/vunit/vhdl/**/*2019*",
+    'vunit/vunit/vhdl/com/test/tb_com_codec.vhd',
 ]
 
 osvvm.files = [
-    'OSVVM/AlertLogPkg.vhd',
-    'OSVVM/CoveragePkg.vhd',
-    'OSVVM/MemoryGenericPkg.vhd',
-    'OSVVM/MemoryPkg.vhd',
-    #'OSVVM/MemoryPkg_c.vhd',
-    #'OSVVM/MemoryPkg_orig_c.vhd',
-    'OSVVM/MemorySupportPkg.vhd',
-    'OSVVM/MessageListPkg.vhd',
-    'OSVVM/MessagePkg.vhd',
-    'OSVVM/NamePkg.vhd',
-    'OSVVM/NameStorePkg.vhd',
-    'OSVVM/OsvvmContext.vhd',
-    'OSVVM/OsvvmScriptSettingsPkg.vhd',
-    'OSVVM/OsvvmScriptSettingsPkg_default.vhd',
-    'OSVVM/OsvvmSettingsPkg.vhd',
-    'OSVVM/OsvvmSettingsPkg_default.vhd',
-    'OSVVM/OsvvmGlobalPkg.vhd',
-    'OSVVM/OsvvmTypesPkg.vhd',
-    'OSVVM/DelayCoveragePkg.vhd',
-    'OSVVM/RandomBasePkg.vhd',
-    'OSVVM/RandomPkg.vhd',
-    'OSVVM/RandomProcedurePkg.vhd',
-    'OSVVM/ReportPkg.vhd',
-    'OSVVM/ResizePkg.vhd',
-    'OSVVM/ResolutionPkg.vhd',
-    'OSVVM/ScoreboardGenericPkg.vhd',
-    'OSVVM/ScoreboardPkg_int.vhd',
-    #'OSVVM/ScoreboardPkg_int_c.vhd',
-    'OSVVM/ScoreboardPkg_slv.vhd',
-    #'OSVVM/ScoreboardPkg_slv_c.vhd',
-    'OSVVM/SortListPkg_int.vhd',
-    'OSVVM/TbUtilPkg.vhd',
-    'OSVVM/TextUtilPkg.vhd',
-    'OSVVM/TranscriptPkg.vhd',
-    'OSVVM/VendorCovApiPkg.vhd',
-    #'OSVVM/VendorCovApiPkg_Aldec.vhd',
+    'OSVVM/*.vhd',
+]
+osvvm.exclude = [
+    'OSVVM/*_c.vhd',
+    'OSVVM/VendorCovApiPkg_Aldec.vhd',
 ]
 
 uvvm_util.files = ['UVVM/uvvm_util/**/*.vhd']