diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 000000000..a18711de4 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,6 @@ +{ + "recommendations": [ + "adguard.adblock" + ], + "unwantedRecommendations": [] +} diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 9dc6b4df6..000000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "Listen for Xdebug", - "type": "php", - "request": "launch", - "port": 9003 - }, - { - "name": "Launch currently open script", - "type": "php", - "request": "launch", - "program": "${file}", - "cwd": "${fileDirname}", - "port": 0, - "runtimeArgs": [ - "-dxdebug.start_with_request=yes" - ], - "env": { - "XDEBUG_MODE": "debug,develop", - "XDEBUG_CONFIG": "client_port=${port}" - } - }, - { - "name": "Launch Built-in web server", - "type": "php", - "request": "launch", - "runtimeArgs": [ - "-dxdebug.mode=debug", - "-dxdebug.start_with_request=yes", - "-S", - "localhost:0" - ], - "program": "", - "cwd": "${workspaceRoot}", - "port": 9003, - "serverReadyAction": { - "pattern": "Development Server \\(http://localhost:([0-9]+)\\) started", - "uriFormat": "http://localhost:%s", - "action": "openExternally" - } - } - ] -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index cd480e591..d6a546e57 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,11 @@ { - "python.pythonPath": "/usr/bin/python3.10", + "title": "Adblock Rules", + "description": "Adblock Rules for uBlock Origin by My Privacy DNS", + "diffEditor.ignoreTrimWhitespace": false, + "workbench.colorCustomizations": { + "editorLineNumber.foreground": "#00ff00" + }, + "workbench.settings.editor": "json", + "python.pythonPath": "/usr/bin/python3.11", "python.formatting.provider": "black" -] } diff --git a/tools/hostscompilerconf.json b/tools/hostscompilerconf.json index 11d9ee184..4f13edef4 100644 --- a/tools/hostscompilerconf.json +++ b/tools/hostscompilerconf.json @@ -884,11 +884,6 @@ "source": "https://raw.githubusercontent.com/easylist/easylist/master/fanboy-addon/fanboy_newsletter_specific_ABP.txt", "type": "adblock" }, - { - "name": "EasyList @ryanbr (Fanboy) newsletter shopping specific ABP", - "source": "https://raw.githubusercontent.com/easylist/easylist/master/fanboy-addon/fanboy_shopping_specific_ABP.txt", - "type": "adblock" - }, { "name": "EasyList @ryanbr (Fanboy) newsletter shopping specific block", "source": "https://raw.githubusercontent.com/easylist/easylist/master/fanboy-addon/fanboy_newsletter_shopping_specific_block.txt",