Merge branch 'topic/vadim/ea' into 'master'

East Asian Width and Emoji support

Closes #222

See merge request eng/ide/VSS!315

.github/workflows/main.yml

@@ -44,6 +44,13 @@ jobs:
           curl -C - -o UCD-15.1.0.zip https://www.unicode.org/Public/15.1.0/ucd/UCD.zip
           mkdir vss/data/ucd
           unzip UCD-15.1.0.zip -d vss/data/ucd
+      - name: Get Emoji data
+        run: |
+          mkdir emoji
+          curl -o vss/data/emoji/ReadMe.txt https://www.unicode.org/Public/emoji/15.1/ReadMe.txt
+          curl -o vss/data/emoji/emoji-sequences.txt https://www.unicode.org/Public/emoji/15.1/emoji-sequences.txt
+          curl -o vss/data/emoji/emoji-test.txt https://www.unicode.org/Public/emoji/15.1/emoji-test.txt
+          curl -o vss/data/emoji/emoji-zwj-sequences.txt https://www.unicode.org/Public/emoji/15.1/emoji-zwj-sequences.txt
       - name: Get regexp tests
         run: |
           curl -C - -o vss/data/re_tests https://raw.githubusercontent.com/Perl/perl5/blead/t/re/re_tests

.gitlab-ci.yml

@@ -109,7 +109,7 @@ build_and_test_dev:
 
       # Fetch tests' data into `./data/`
       PACKAGE=vss-tests-data.tar.bz2
-      VERSION=4
+      VERSION=5
       VSS_URL=https://gitlab.adacore-it.com/api/v4/projects/129
       curl -L --header "JOB-TOKEN: $CI_JOB_TOKEN" \
         $VSS_URL/packages/generic/$PACKAGE/$VERSION/$PACKAGE |\

Makefile

@@ -74,7 +74,7 @@ check_text:
 	.objs/tests/test_character_iterators
 	.objs/tests/test_character_markers
 	.objs/tests/test_converters
-	.objs/tests/test_grapheme_cluster_iterators data/ucd
+	.objs/tests/test_grapheme_cluster_iterators data/ucd data/emoji
 	.objs/tests/test_line_iterators
 	.objs/tests/test_stream_element_vector
 	.objs/tests/test_text_streams

data/.gitignore

@@ -1,2 +1,3 @@
+emoji
 parse-number-fxx-test-data
 ucd

data/README.md

@@ -10,6 +10,11 @@ curl -o UCD-15.1.0.zip https://www.unicode.org/Public/15.1.0/ucd/UCD.zip
 mkdir ucd
 unzip UCD-15.1.0.zip -d ucd
 rm -f UCD-15.1.0.zip
+mkdir emoji
+curl -o emoji/ReadMe.txt https://www.unicode.org/Public/emoji/15.1/ReadMe.txt
+curl -o emoji/emoji-sequences.txt https://www.unicode.org/Public/emoji/15.1/emoji-sequences.txt
+curl -o emoji/emoji-test.txt https://www.unicode.org/Public/emoji/15.1/emoji-test.txt
+curl -o emoji/emoji-zwj-sequences.txt https://www.unicode.org/Public/emoji/15.1/emoji-zwj-sequences.txt
 git clone https://github.com/nigeltao/parse-number-fxx-test-data
 rm -rf parse-number-fxx-test-data/.git
 git close https://github.com/json5/json5-tests.git

source/text/implementation/vss-implementation-character_codes.ads

@@ -1,5 +1,5 @@
 --
---  Copyright (C) 2023, AdaCore
+--  Copyright (C) 2023-2024, AdaCore
 --
 --  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 --
@@ -86,12 +86,16 @@ package VSS.Implementation.Character_Codes is
 
    No_Break_Space                           : constant := 16#00_00A0#;
 
+   Combining_Enclosing_Keycap               : constant := 16#00_20E3#;
+
    Zero_Width_Non_Joiner                    : constant := 16#00_200C#;
    Zero_Width_Joiner                        : constant := 16#00_200D#;
 
    Line_Separator                           : constant := 16#00_2028#;
    Paragraph_Separator                      : constant := 16#00_2029#;
 
+   Variation_Selector_16                    : constant := 16#00_FE0F#;
+
    Zero_Width_No_Break_Space                : constant := 16#00_FEFF#;
 
 end VSS.Implementation.Character_Codes;