Skip to content

Commit 95aec7f

Browse files
authored
Merge branch 'main' into lsp-fixes
2 parents 866c7f8 + 3f36db5 commit 95aec7f

File tree

100 files changed

+738
-25346
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+738
-25346
lines changed

.all-contributorsrc

Lines changed: 114 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,8 @@
350350
"avatar_url": "https://avatars.githubusercontent.com/u/3434564?v=4",
351351
"profile": "https://github.com/joshgiesbrecht",
352352
"contributions": [
353-
"code"
353+
"code",
354+
"bug"
354355
]
355356
},
356357
{
@@ -1491,7 +1492,8 @@
14911492
"profile": "https://github.com/babaissarkar",
14921493
"contributions": [
14931494
"code",
1494-
"a11y"
1495+
"a11y",
1496+
"doc"
14951497
]
14961498
},
14971499
{
@@ -1530,6 +1532,116 @@
15301532
"contributions": [
15311533
"code"
15321534
]
1535+
},
1536+
{
1537+
"login": "ovalnine",
1538+
"name": "ovalnine",
1539+
"avatar_url": "https://avatars.githubusercontent.com/u/13293768?v=4",
1540+
"profile": "https://github.com/ovalnine",
1541+
"contributions": [
1542+
"code"
1543+
]
1544+
},
1545+
{
1546+
"login": "jd-boyd",
1547+
"name": "Joshua D. Boyd",
1548+
"avatar_url": "https://avatars.githubusercontent.com/u/361465?v=4",
1549+
"profile": "http://blog.jdboyd.net/",
1550+
"contributions": [
1551+
"doc"
1552+
]
1553+
},
1554+
{
1555+
"login": "Vaivaswat2244",
1556+
"name": "Vaivaswat Dubey",
1557+
"avatar_url": "https://avatars.githubusercontent.com/u/113991324?v=4",
1558+
"profile": "https://github.com/Vaivaswat2244",
1559+
"contributions": [
1560+
"code"
1561+
]
1562+
},
1563+
{
1564+
"login": "jSdCool",
1565+
"name": "jSdCool",
1566+
"avatar_url": "https://avatars.githubusercontent.com/u/37940266?v=4",
1567+
"profile": "https://www.cbi-games.org",
1568+
"contributions": [
1569+
"code",
1570+
"doc"
1571+
]
1572+
},
1573+
{
1574+
"login": "AhmedMagedC",
1575+
"name": "AhmedMaged",
1576+
"avatar_url": "https://avatars.githubusercontent.com/u/111961041?v=4",
1577+
"profile": "https://github.com/AhmedMagedC",
1578+
"contributions": [
1579+
"code"
1580+
]
1581+
},
1582+
{
1583+
"login": "ThexXTURBOXx",
1584+
"name": "Nico Mexis",
1585+
"avatar_url": "https://avatars.githubusercontent.com/u/12763829?v=4",
1586+
"profile": "http://nmexis.me",
1587+
"contributions": [
1588+
"code"
1589+
]
1590+
},
1591+
{
1592+
"login": "tychedelia",
1593+
"name": "charlotte 🌸",
1594+
"avatar_url": "https://avatars.githubusercontent.com/u/10366310?v=4",
1595+
"profile": "http://charlotte.fyi",
1596+
"contributions": [
1597+
"review"
1598+
]
1599+
},
1600+
{
1601+
"login": "jdebou",
1602+
"name": "Joackim de Bourqueney",
1603+
"avatar_url": "https://avatars.githubusercontent.com/u/80685479?v=4",
1604+
"profile": "http://i-j.fr",
1605+
"contributions": [
1606+
"code"
1607+
]
1608+
},
1609+
{
1610+
"login": "toniab",
1611+
"name": "Tonz",
1612+
"avatar_url": "https://avatars.githubusercontent.com/u/370199?v=4",
1613+
"profile": "https://github.com/toniab",
1614+
"contributions": [
1615+
"code",
1616+
"doc"
1617+
]
1618+
},
1619+
{
1620+
"login": "aj-m",
1621+
"name": "Andrew",
1622+
"avatar_url": "https://avatars.githubusercontent.com/u/2524348?v=4",
1623+
"profile": "https://github.com/aj-m",
1624+
"contributions": [
1625+
"code"
1626+
]
1627+
},
1628+
{
1629+
"login": "pnngocdoan",
1630+
"name": "Ngoc Doan",
1631+
"avatar_url": "https://avatars.githubusercontent.com/u/113954980?v=4",
1632+
"profile": "https://github.com/pnngocdoan",
1633+
"contributions": [
1634+
"code"
1635+
]
1636+
},
1637+
{
1638+
"login": "manoellribeiro",
1639+
"name": "Manoel Ribeiro",
1640+
"avatar_url": "https://avatars.githubusercontent.com/u/59377764?v=4",
1641+
"profile": "https://github.com/manoellribeiro",
1642+
"contributions": [
1643+
"doc"
1644+
]
15331645
}
15341646
],
15351647
"repoType": "github",

.gitignore

Lines changed: 106 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,126 @@
1-
.DS_Store
2-
.AppleDouble
3-
._*
4-
*~
5-
/build/shared/reference.zip
6-
7-
*.x
8-
9-
#*.iml
10-
#/.idea
11-
12-
# may need to bring this back later
13-
/.idea/codeStyles
14-
15-
# via https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
16-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
17-
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
18-
19-
# User-specific stuff
20-
.idea/**/workspace.xml
21-
.idea/**/tasks.xml
22-
.idea/**/usage.statistics.xml
23-
.idea/**/dictionaries
24-
.idea/**/shelf
25-
26-
# Generated files
27-
.idea/**/contentModel.xml
28-
29-
# Sensitive or high-churn files
30-
.idea/**/dataSources/
31-
.idea/**/dataSources.ids
32-
.idea/**/dataSources.local.xml
33-
.idea/**/sqlDataSources.xml
34-
.idea/**/dynamic.xml
35-
.idea/**/uiDesigner.xml
36-
.idea/**/dbnavigator.xml
37-
38-
# Gradle
39-
.idea/**/gradle.xml
40-
.idea/**/libraries
41-
42-
# Gradle and Maven with auto-import
43-
# When using Gradle or Maven with auto-import, you should exclude module files,
44-
# since they will be recreated, and may cause churn. Uncomment if using
45-
# auto-import.
46-
# .idea/modules.xml
47-
# .idea/*.iml
48-
# .idea/modules
49-
50-
# CMake
51-
cmake-build-*/
52-
53-
# Mongo Explorer plugin
54-
.idea/**/mongoSettings.xml
55-
56-
# File-based project format
57-
*.iws
1+
# Created by https://www.toptal.com/developers/gitignore/api/android,gradle,java
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=android,gradle,java
3+
4+
### Android ###
5+
# Gradle files
6+
.gradle/
7+
build/
8+
9+
# Local configuration file (sdk path, etc)
10+
local.properties
11+
12+
# Log/OS Files
13+
*.log
14+
15+
# Android Studio generated files and folders
16+
captures/
17+
.externalNativeBuild/
18+
.cxx/
19+
*.apk
20+
output.json
5821

5922
# IntelliJ
60-
out/
23+
*.iml
24+
.idea/*
25+
misc.xml
26+
deploymentTargetDropDown.xml
27+
render.experimental.xml
6128

62-
# mpeltonen/sbt-idea plugin
63-
.idea_modules/
29+
# Keystore files
30+
*.jks
31+
*.keystore
6432

65-
# JIRA plugin
66-
atlassian-ide-plugin.xml
33+
# Google Services (e.g. APIs or Firebase)
34+
google-services.json
6735

68-
# Cursive Clojure plugin
69-
.idea/replstate.xml
36+
# Android Profiling
37+
*.hprof
7038

71-
# Crashlytics plugin (for Android Studio and IntelliJ)
72-
com_crashlytics_export_strings.xml
73-
crashlytics.properties
74-
crashlytics-build.properties
75-
fabric.properties
39+
### Android Patch ###
40+
gen-external-apklibs
7641

77-
# Editor-based Rest Client
78-
.idea/httpRequests
42+
# Replacement of .externalNativeBuild directories introduced
43+
# with Android Studio 3.5.
7944

80-
# Android studio 3.1+ serialized cache file
81-
.idea/caches/build_file_checksums.ser
45+
### Java ###
46+
# Compiled class file
47+
*.class
8248

83-
# temporarily ignore IntelliJ bits
84-
*.eml
49+
# Log file
8550

86-
# testing boogers
87-
bin-test
51+
# BlueJ files
52+
*.ctxt
8853

89-
# dated folders
90-
/19*
91-
/20*
54+
# Mobile Tools for Java (J2ME)
55+
.mtj.tmp/
9256

93-
# VS Code Java project files
94-
.project
95-
.vscode/
57+
# Package Files #
58+
*.war
59+
*.nar
60+
*.ear
61+
*.zip
62+
*.tar.gz
63+
*.rar
9664

97-
# Processing examples
98-
processing-examples
65+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
66+
hs_err_pid*
67+
replay_pid*
9968

100-
# Maven ignores
69+
### Gradle ###
10170
.gradle
102-
core/build/
103-
build/publish/
104-
app/build
105-
java/build/
106-
/build/reports
107-
/java/bin
108-
/java/libraries/svg/bin
109-
/java/preprocessor/build
110-
/java/lsp/build
111-
/.kotlin/sessions
112-
/core/examples/build
71+
**/build/
72+
!src/**/build/
73+
74+
# Ignore Gradle GUI config
75+
gradle-app.setting
11376

77+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
78+
!gradle-wrapper.jar
79+
80+
# Avoid ignore Gradle wrappper properties
81+
!gradle-wrapper.properties
82+
83+
# Cache of project
84+
.gradletasknamecache
85+
86+
# Eclipse Gradle plugin generated files
87+
# Eclipse Core
88+
.project
89+
# JDT-specific (Eclipse Java Development Tools)
90+
.classpath
91+
92+
### Gradle Patch ###
93+
# Java heap dump
94+
95+
# End of https://www.toptal.com/developers/gitignore/api/android,gradle,java
96+
.DS_Store
97+
bin/*
11498
.build/
99+
.processing/
100+
library/*
101+
generated/
102+
!/build/
103+
!.idea/runConfigurations/
104+
!/java/application/launch4j/bin/*
105+
!java/libraries/io/library/**/*.so
106+
/app/lib
107+
/build/macos/work/Processing.app
108+
/core/library
109+
/core/bin
110+
/build/shared/tools/MovieMaker/tool/ffmpeg
111+
/build/shared/tools/MovieMaker/tool/*.jar
112+
/core/methods/methods.jar
113+
/java/libraries/*/library/*.jar
114+
/build/macos/*.tgz
115+
/build/shared/tools/MovieMaker/*.gz
116+
/app/bin/processing/app/laf/FlatLaf.properties
117+
/app/pde.jar
118+
/java/mode/gson.jar
119+
/java/mode/JavaMode.jar
120+
/java/mode/org.eclipse.lsp4j.jar
121+
/java/mode/org.eclipse.lsp4j.jsonrpc.jar
122+
!java/libraries/pdf/library/itext.jar
123+
!java/libraries/serial/library/jssc.jar
115124
/app/windows/obj
116125
/java/gradle/build
117126
/java/gradle/example/.processing

.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/ant.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/artifacts/app_desktop.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/artifacts/app_jvm.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/compiler.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)