Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion external/googletest
Submodule googletest updated 62 files
+14 −0 BUILD.bazel
+1 −1 CMakeLists.txt
+5 −6 MODULE.bazel
+12 −12 README.md
+11 −6 WORKSPACE
+5 −5 ci/linux-presubmit.sh
+1 −1 ci/macos-presubmit.sh
+5 −3 ci/windows-presubmit.bat
+1 −1 docs/gmock_cheat_sheet.md
+61 −25 docs/gmock_cook_book.md
+1 −1 docs/quickstart-bazel.md
+2 −2 googlemock/CMakeLists.txt
+31 −47 googlemock/include/gmock/gmock-actions.h
+252 −102 googlemock/include/gmock/gmock-matchers.h
+13 −8 googlemock/include/gmock/gmock-more-matchers.h
+5 −0 googlemock/include/gmock/gmock-spec-builders.h
+12 −23 googlemock/include/gmock/internal/gmock-internal-utils.h
+5 −4 googlemock/include/gmock/internal/gmock-port.h
+121 −21 googlemock/include/gmock/internal/gmock-pp.h
+0 −10 googlemock/src/gmock-spec-builders.cc
+2 −4 googlemock/test/BUILD.bazel
+70 −79 googlemock/test/gmock-actions_test.cc
+145 −11 googlemock/test/gmock-function-mocker_test.cc
+28 −46 googlemock/test/gmock-matchers-comparisons_test.cc
+132 −0 googlemock/test/gmock-matchers-containers_test.cc
+1 −1 googlemock/test/gmock-matchers-misc_test.cc
+1 −2 googlemock/test/gmock-matchers_test.h
+2 −3 googlemock/test/gmock-more-actions_test.cc
+4 −2 googlemock/test/gmock-pp_test.cc
+3 −1 googlemock/test/gmock_link_test.h
+3 −1 googlemock/test/gmock_stress_test.cc
+6 −3 googlemock/test/gmock_test.cc
+16 −25 googletest/CMakeLists.txt
+1 −1 googletest/README.md
+39 −47 googletest/cmake/internal_utils.cmake
+33 −17 googletest/include/gtest/gtest-assertion-result.h
+56 −50 googletest/include/gtest/gtest-matchers.h
+2 −2 googletest/include/gtest/gtest-message.h
+2 −2 googletest/include/gtest/gtest-param-test.h
+57 −56 googletest/include/gtest/gtest-printers.h
+27 −20 googletest/include/gtest/gtest.h
+7 −1 googletest/include/gtest/internal/gtest-death-test-internal.h
+18 −11 googletest/include/gtest/internal/gtest-internal.h
+175 −117 googletest/include/gtest/internal/gtest-port.h
+0 −5 googletest/include/gtest/internal/gtest-string.h
+2 −6 googletest/include/gtest/internal/gtest-type-util.h
+3 −1 googletest/samples/sample2_unittest.cc
+6 −9 googletest/src/gtest-internal-inl.h
+0 −2 googletest/src/gtest-matchers.cc
+44 −11 googletest/src/gtest-port.cc
+51 −14 googletest/src/gtest-printers.cc
+84 −61 googletest/src/gtest.cc
+6 −8 googletest/test/BUILD.bazel
+9 −0 googletest/test/custom/gmock_dynamic_cast_message_test.proto
+2 −0 googletest/test/googletest-death-test-test.cc
+2 −2 googletest/test/googletest-listener-test.cc
+4 −2 googletest/test/googletest-output-test.py
+2 −1 googletest/test/googletest-output-test_.cc
+2 −4 googletest/test/googletest-param-test-test.cc
+52 −24 googletest/test/googletest-printers-test.cc
+12 −1 googletest/test/gtest_help_test.py
+131 −184 googletest/test/gtest_unittest.cc
6 changes: 4 additions & 2 deletions src/NppJsonViewer/AboutDlg.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#include "AboutDlg.h"

#include <string>
#include <commctrl.h>

#include "resource.h"
#include "Utility.h"
#include "StringHelper.h"
#include "Define.h"
#include <string>
#include <commctrl.h>


AboutDlg::AboutDlg(HINSTANCE hInstance, HWND hParent, int nCmdId)
Expand Down
1 change: 1 addition & 0 deletions src/NppJsonViewer/AboutDlg.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#pragma once

#include "DockingFeature/StaticDialog.h"

class AboutDlg : public StaticDialog
Expand Down
7 changes: 7 additions & 0 deletions src/NppJsonViewer/Define.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#pragma once

#include <string>

#include "PluginInterface.h"

// Define the number of plugin commands here
Expand Down Expand Up @@ -64,6 +67,8 @@ const TCHAR STR_INI_FORMATTING_INDENTCOUNT[] = TEXT("INDENTATION_COUNT");

const TCHAR STR_INI_OTHER_SEC[] = TEXT("Others");
const TCHAR STR_INI_OTHER_FOLLOW_TAB[] = TEXT("FOLLOW_TAB");
const TCHAR STR_INI_OTHER_TREE_ZOOM[] = TEXT("TREE_ZOOM_LEVEL");
const TCHAR STR_INI_OTHER_DRAW_ON_OPEN[] = TEXT("DRAW_ON_OPEN");
const TCHAR STR_INI_OTHER_AUTO_FORMAT[] = TEXT("AUTO_FORMAT");
const TCHAR STR_INI_OTHER_USE_HIGHLIGHT[] = TEXT("USE_JSON_HIGHLIGHT");
const TCHAR STR_INI_OTHER_IGNORE_COMMENT[] = TEXT("IGNORE_COMMENT");
Expand Down Expand Up @@ -114,7 +119,9 @@ struct Setting
LineFormat lineFormat = LineFormat::DEFAULT;
Indent indent {};
bool bFollowCurrentTab = false;
bool bDrawOnOpen = false; // Draw the tree once when a json file is opened
bool bAutoFormat = false;
bool bUseJsonHighlight = true;
int nTreeZoom = 100; // Tree view font zoom in percent (80..250)
ParseOptions parseOptions {};
};
4 changes: 2 additions & 2 deletions src/NppJsonViewer/JsonHandler.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "JsonHandler.h"

#include <vector>
#include <algorithm>

#include "JsonHandler.h"

namespace rj = rapidjson;


Expand Down
1 change: 1 addition & 0 deletions src/NppJsonViewer/JsonNode.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#pragma once

#include <string>

enum class JsonNodeType : short
Expand Down
Loading