Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for "fragment extensions" #7632

Merged
46 commits merged into from
Feb 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1426505
rough implementation
PankajBhojwani Sep 14, 2020
b7807df
helper for json parsing, string localizations, method descriptions
PankajBhojwani Sep 16, 2020
de62b83
formatting
PankajBhojwani Sep 16, 2020
c39ffce
check minimum new profile requirements
PankajBhojwani Sep 16, 2020
9ed5d7c
distinguish between stubs/files
PankajBhojwani Sep 16, 2020
a0d0a3f
add colour schemes
PankajBhojwani Sep 16, 2020
993f28a
accumulate json files returns a set instead of taking one in
PankajBhojwani Sep 16, 2020
68c0a5b
grab json files from app extensions
PankajBhojwani Sep 17, 2020
cd6bdb3
update to folder paths
PankajBhojwani Sep 18, 2020
f7bbc92
add comments throughout
PankajBhojwani Sep 18, 2020
82444b5
exSPELLiarmus
PankajBhojwani Sep 18, 2020
98eb87e
update from discussion
PankajBhojwani Sep 21, 2020
a733479
fragments subdirectory for app extensions
PankajBhojwani Oct 5, 2020
ee7d038
change extension host name, generate guids for proto extensions
PankajBhojwani Oct 7, 2020
b4c805d
merge with master
PankajBhojwani Oct 8, 2020
349245b
Merge branch 'master' of https://github.com/microsoft/terminal into d…
PankajBhojwani Oct 8, 2020
bbb8d48
moving header files
PankajBhojwani Oct 8, 2020
6f42682
updates from discussion
PankajBhojwani Oct 12, 2020
01bb0ed
cleanup leftover static strings from previous implementation
PankajBhojwani Oct 13, 2020
3706d21
comment update
PankajBhojwani Oct 15, 2020
84fda1d
Merge branch 'master' of https://github.com/microsoft/terminal into d…
PankajBhojwani Oct 15, 2020
db77649
Merge branch 'master' of https://github.com/microsoft/terminal into d…
PankajBhojwani Oct 15, 2020
eda84d8
naming update
PankajBhojwani Oct 15, 2020
4d0e912
Merge branch 'master' of https://github.com/microsoft/terminal into d…
PankajBhojwani Oct 15, 2020
92a302e
update dictionary, merge master
PankajBhojwani Oct 15, 2020
0b3040a
naming fix 2
PankajBhojwani Oct 15, 2020
7bbb002
address comments
PankajBhojwani Oct 15, 2020
febca4b
dont hard code path separator
PankajBhojwani Oct 15, 2020
1557a3b
use filename() to get folder name
PankajBhojwani Oct 16, 2020
01a13bb
Merge branch 'main' of https://github.com/microsoft/terminal into dev…
PankajBhojwani Dec 11, 2020
3275fca
fixes now that SUI is in
PankajBhojwani Dec 12, 2020
47ee2b9
address initial comments
PankajBhojwani Jan 4, 2021
99de63a
add inheritance layer
PankajBhojwani Jan 5, 2021
fb754c1
move validate color scheme to colorscheme.cpp
PankajBhojwani Jan 6, 2021
676c975
other manifests
PankajBhojwani Jan 7, 2021
c7fc8af
address comments
PankajBhojwani Jan 8, 2021
062ade3
family name
PankajBhojwani Jan 8, 2021
e2dd9b9
known folder api
PankajBhojwani Jan 8, 2021
fa3e01e
comment
PankajBhojwani Jan 8, 2021
2219258
address comments
PankajBhojwani Jan 29, 2021
d17914f
check existence
PankajBhojwani Feb 19, 2021
cd3b74b
try catch
PankajBhojwani Feb 19, 2021
58bf21d
Lift the CV+Mutex main thread waiter to a helper function
DHowett Feb 19, 2021
bc7cfad
spell, rename
PankajBhojwani Feb 19, 2021
e933441
format
PankajBhojwani Feb 19, 2021
a4b3451
Merge branch 'main' of https://github.com/microsoft/terminal into dev…
PankajBhojwani Feb 19, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/actions/spelling/dictionary/apis.txt
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ TBPF
THEMECHANGED
tmp
tolower
TTask
TVal
tx
UPDATEINIFILE
userenv
Expand Down
7 changes: 6 additions & 1 deletion src/cascadia/CascadiaPackage/Package-Dev.appxmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
IgnorableNamespaces="uap mp rescap">
IgnorableNamespaces="uap mp rescap uap3">

<Identity
Name="WindowsTerminalDev"
Expand Down Expand Up @@ -69,6 +69,11 @@
Enabled="false"
DisplayName="ms-resource:AppNameDev" />
</uap5:Extension>
<uap3:Extension Category="windows.appExtensionHost">
PankajBhojwani marked this conversation as resolved.
Show resolved Hide resolved
<uap3:AppExtensionHost>
<uap3:Name>com.microsoft.windows.terminal.settings</uap3:Name>
</uap3:AppExtensionHost>
</uap3:Extension>

<com:Extension Category="windows.comServer">
<com:ComServer>
Expand Down
7 changes: 6 additions & 1 deletion src/cascadia/CascadiaPackage/Package-Pre.appxmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
IgnorableNamespaces="uap mp rescap">
IgnorableNamespaces="uap mp rescap uap3">

<Identity
Name="Microsoft.WindowsTerminalPreview"
Expand Down Expand Up @@ -64,6 +64,11 @@
<desktop:ExecutionAlias Alias="wt.exe" />
</uap3:AppExecutionAlias>
</uap3:Extension>
<uap3:Extension Category="windows.appExtensionHost">
<uap3:AppExtensionHost>
<uap3:Name>com.microsoft.windows.terminal.settings</uap3:Name>
</uap3:AppExtensionHost>
</uap3:Extension>
<uap5:Extension Category="windows.startupTask">
<uap5:StartupTask
TaskId="StartTerminalOnLoginTask"
Expand Down
7 changes: 6 additions & 1 deletion src/cascadia/CascadiaPackage/Package.appxmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
IgnorableNamespaces="uap mp rescap">
IgnorableNamespaces="uap mp rescap uap3">

<Identity
Name="Microsoft.WindowsTerminal"
Expand Down Expand Up @@ -64,6 +64,11 @@
<desktop:ExecutionAlias Alias="wt.exe" />
</uap3:AppExecutionAlias>
</uap3:Extension>
<uap3:Extension Category="windows.appExtensionHost">
<uap3:AppExtensionHost>
<uap3:Name>com.microsoft.windows.terminal.settings</uap3:Name>
</uap3:AppExtensionHost>
</uap3:Extension>
<uap5:Extension Category="windows.startupTask">
<uap5:StartupTask
TaskId="StartTerminalOnLoginTask"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" IgnorableNamespaces="uap mp uap3">
<Identity Name="WindowsTerminal.TestHost" Publisher="CN=Windows Terminal Team" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="fba054a7-f1a1-4cb7-bb21-4949919af2f5" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
Expand All @@ -22,6 +22,13 @@
</uap:DefaultTile>
<uap:SplashScreen Image="taef.png" />
</uap:VisualElements>
<Extensions>
PankajBhojwani marked this conversation as resolved.
Show resolved Hide resolved
<uap3:Extension Category="windows.appExtensionHost">
<uap3:AppExtensionHost>
<uap3:Name>com.microsoft.windows.terminal.settings</uap3:Name>
</uap3:AppExtensionHost>
</uap3:Extension>
</Extensions>
</Application>
</Applications>
</Package>
6 changes: 6 additions & 0 deletions src/cascadia/TerminalSettingsModel/CascadiaSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
winrt::com_ptr<implementation::Profile> _FindMatchingProfile(const Json::Value& profileJson);
std::optional<uint32_t> _FindMatchingProfileIndex(const Json::Value& profileJson);
void _LayerOrCreateColorScheme(const Json::Value& schemeJson);
Json::Value _ParseUtf8JsonString(std::string_view fileData);

winrt::com_ptr<implementation::ColorScheme> _FindMatchingColorScheme(const Json::Value& schemeJson);
void _ParseJsonString(std::string_view fileData, const bool isDefaultSettings);
static const Json::Value& _GetProfilesJsonObject(const Json::Value& json);
Expand All @@ -129,6 +131,10 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
void _ApplyDefaultsFromUserSettings();

void _LoadDynamicProfiles();
void _LoadFragmentExtensions();
void _ApplyJsonStubsHelper(const std::wstring_view directory, const std::unordered_set<std::wstring>& ignoredNamespaces);
std::unordered_set<std::string> _AccumulateJsonFilesInDirectory(const std::wstring_view directory);
void _ParseAndLayerFragmentFiles(const std::unordered_set<std::string> files, const winrt::hstring source);

static bool _IsPackaged();
static void _WriteSettings(std::string_view content, const hstring filepath);
Expand Down
Loading