Merge branch 'v0.11.2-next'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.11.3] -- 2023-02-23
+
+### Bugfix
+
+- Fix redundant null byte inserted with the emoji completer
+
 ## [0.11.2] -- 2023-02-20
 
 ### Highlights

CMakeLists.txt

@@ -110,7 +110,7 @@ include(GNUInstallDirs)
 
 set(CPACK_PACKAGE_VERSION_MAJOR "0")
 set(CPACK_PACKAGE_VERSION_MINOR "11")
-set(CPACK_PACKAGE_VERSION_PATCH "2")
+set(CPACK_PACKAGE_VERSION_PATCH "3")
 set(PROJECT_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR})
 set(PROJECT_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR})
 set(PROJECT_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH})

appveyor.yml

@@ -1,6 +1,6 @@
 ---
 
-version: 0.11.2-{build}
+version: 0.11.3-{build}
 
 configuration: Release
 image: Visual Studio 2022
@@ -29,8 +29,8 @@ build_script:
     # VERSION format:     branch-master/branch-1.2
     # INSTVERSION format: x.y.z
     # WINVERSION format:  9999.0.0.123/1.2.0.234
-    - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.11.2
+    - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.11.3
-    - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.11.2
+    - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.11.3
     - if "%APPVEYOR_REPO_TAG%"=="false" if "%APPVEYOR_REPO_BRANCH%"=="master" set INSTVERSION=9999.0
     - if "%APPVEYOR_REPO_TAG%"=="false" set WINVERSION=%INSTVERSION%.0.%APPVEYOR_BUILD_NUMBER%
     # VERSION format:     v1.2.3/v1.3.4
@@ -93,8 +93,8 @@ after_build:
     - copy %BUILD%\deploy\installer\gui\package.xml installer\packages\io.github.nhekoreborn.nheko\meta
     - copy %BUILD%\deploy\installer\gui\installscript.qs installer\packages\io.github.nhekoreborn.nheko\meta
     # Amend version and date
-    - sed -i "s/__VERSION__/0.11.2/" installer\config\config.xml
+    - sed -i "s/__VERSION__/0.11.3/" installer\config\config.xml
-    - sed -i "s/__VERSION__/0.11.2/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
+    - sed -i "s/__VERSION__/0.11.3/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
     - sed -i "s/__DATE__/%DATE%/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
     # Copy nheko data
     - xcopy NhekoData\*.* installer\packages\io.github.nhekoreborn.nheko\data\*.* /s /e /c /y

resources/nheko.appdata.xml.in

@@ -61,6 +61,7 @@
   <url type="homepage">https://github.com/Nheko-Reborn/nheko</url>
   <update_contact>https://github.com/Nheko-Reborn</update_contact>
   <releases>
+    <release date="2023-02-23" version="0.11.3"/>
     <release date="2023-02-20" version="0.11.2"/>
     <release date="2023-01-15" version="0.11.1"/>
     <release date="2023-01-12" version="0.11.0"/>

scripts/emoji_codegen.py

@@ -19,7 +19,7 @@ constexpr const std::array<Emoji, {{ entrycount }} > emoji::Provider::emoji = {
     {%- for c in kwargs.items() %}
     // {{ c[0].capitalize() }}
     {%- for e in c[1] %}
-    Emoji{null_literal(u"{{ e.code }}"), null_literal(u"{{ e.shortname }}"), null_literal(u"{{ e.unicodename }}"), emoji::Emoji::Category::{{ c[0].capitalize() }}},
+    Emoji{std::u16string_view(u"{{ e.code }}"), std::u16string_view(u"{{ e.shortname }}"), std::u16string_view(u"{{ e.unicodename }}"), emoji::Emoji::Category::{{ c[0].capitalize() }}},
     {%- endfor %}
     {%- endfor %}
 };
@@ -55,9 +55,9 @@ if __name__ == '__main__':
         'Flags': flags,
         'Component': symbols
     }
-    shortcodeDict = {} 
+    shortcodeDict = {}
     # for my sanity - this strips newlines
-    for line in open(shortcodefilename, 'r', encoding="utf8"): 
+    for line in open(shortcodefilename, 'r', encoding="utf8"):
         longname, shortname = line.strip().split(':')
         shortcodeDict[longname] = shortname
     current_category = ''

src/emoji/Provider.h

@@ -46,9 +46,9 @@ public:
     }
 
     constexpr Emoji()
-      : unicode_(u"", 1)
+      : unicode_(u"", 0)
-      , shortName_(u"", 1)
+      , shortName_(u"", 0)
-      , unicodeName_(u"", 1)
+      , unicodeName_(u"", 0)
       , category(Category::Search)
     {
     }