Skip to content

fix: handle consecutive added empty file diff #38

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 18, 2025
Merged

fix: handle consecutive added empty file diff #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8d739d
fix: handle consecutive-empty-files
yeonjuan May 18, 2025
5eba366
fix: handle no-prefix
yeonjuan May 18, 2025
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
235 changes: 235 additions & 0 deletions src/__fixtures__/31-no-prefix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
diff --git var/folders/kt/zd3bfncd0c3gjx25hbcq483c0000gn/T/epicshop/diff/advanced-react-apis/09.03.solution/dn2ncwjsbmo/index.test.ts var/folders/kt/zd3bfncd0c3gjx25hbcq483c0000gn/T/epicshop/diff/advanced-react-apis/09.03.solution/dn2ncwjsbmo/index.test.ts
new file mode 100644
index 0000000..e69de29
diff --git var/folders/kt/zd3bfncd0c3gjx25hbcq483c0000gn/T/epicshop/diff/advanced-react-apis/playground/dn2ncwjsbmo/index.tsx var/folders/kt/zd3bfncd0c3gjx25hbcq483c0000gn/T/epicshop/diff/advanced-react-apis/09.03.solution/dn2ncwjsbmo/index.tsx
index 4d68325..fd576f7 100644
--- var/folders/kt/zd3bfncd0c3gjx25hbcq483c0000gn/T/epicshop/diff/advanced-react-apis/playground/dn2ncwjsbmo/index.tsx
+++ var/folders/kt/zd3bfncd0c3gjx25hbcq483c0000gn/T/epicshop/diff/advanced-react-apis/09.03.solution/dn2ncwjsbmo/index.tsx
@@ -1,190 +1,54 @@
-import { createContext, useEffect, useState, use, useCallback } from 'react'
+import { Suspense, useSyncExternalStore } from 'react'
import * as ReactDOM from 'react-dom/client'
-import {
- type BlogPost,
- generateGradient,
- getMatchingPosts,
-} from '#shared/blog-posts'
-import { setGlobalSearchParams } from '#shared/utils'

-type SearchParamsTuple = readonly [
- URLSearchParams,
- typeof setGlobalSearchParams,
-]
-const SearchParamsContext = createContext<SearchParamsTuple>([
- new URLSearchParams(window.location.search),
- setGlobalSearchParams,
-])
-
-function SearchParamsProvider({ children }: { children: React.ReactNode }) {
- const [searchParams, setSearchParamsState] = useState(
- () => new URLSearchParams(window.location.search),
- )
+export function makeMediaQueryStore(mediaQuery: string) {
+ function getSnapshot() {
+ return window.matchMedia(mediaQuery).matches
+ }

- useEffect(() => {
- function updateSearchParams() {
- setSearchParamsState((prevParams) => {
- const newParams = new URLSearchParams(window.location.search)
- return prevParams.toString() === newParams.toString()
- ? prevParams
- : newParams
- })
+ function subscribe(callback: () => void) {
+ const mediaQueryList = window.matchMedia(mediaQuery)
+ mediaQueryList.addEventListener('change', callback)
+ return () => {
+ mediaQueryList.removeEventListener('change', callback)
}
- window.addEventListener('popstate', updateSearchParams)
- return () => window.removeEventListener('popstate', updateSearchParams)
- }, [])
-
- const setSearchParams = useCallback(
- (...args: Parameters<typeof setGlobalSearchParams>) => {
- const searchParams = setGlobalSearchParams(...args)
- setSearchParamsState((prevParams) => {
- return prevParams.toString() === searchParams.toString()
- ? prevParams
- : searchParams
- })
- return searchParams
- },
- [],
- )
-
- const searchParamsTuple = [searchParams, setSearchParams] as const
-
- return (
- <SearchParamsContext value={searchParamsTuple}>
- {children}
- </SearchParamsContext>
- )
-}
-
-function useSearchParams() {
- return use(SearchParamsContext)
-}
-
-const getQueryParam = (params: URLSearchParams) => params.get('query') ?? ''
-
-function App() {
- return (
- <SearchParamsProvider>
- <div className="app">
- <Form />
- <MatchingPosts />
- </div>
- </SearchParamsProvider>
- )
-}
-
-function Form() {
- const [searchParams, setSearchParams] = useSearchParams()
- const query = getQueryParam(searchParams)
-
- const words = query.split(' ').map((w) => w.trim())
-
- const dogChecked = words.includes('dog')
- const catChecked = words.includes('cat')
- const caterpillarChecked = words.includes('caterpillar')
-
- function handleCheck(tag: string, checked: boolean) {
- const newWords = checked ? [...words, tag] : words.filter((w) => w !== tag)
- setSearchParams(
- { query: newWords.filter(Boolean).join(' ').trim() },
- { replace: true },
- )
}

- return (
- <form onSubmit={(e) => e.preventDefault()}>
- <div>
- <label htmlFor="searchInput">Search:</label>
- <input
- id="searchInput"
- name="query"
- type="search"
- value={query}
- onChange={(e) =>
- setSearchParams({ query: e.currentTarget.value }, { replace: true })
- }
- />
- </div>
- <div>
- <label>
- <input
- type="checkbox"
- checked={dogChecked}
- onChange={(e) => handleCheck('dog', e.currentTarget.checked)}
- />{' '}
- 🐶 dog
- </label>
- <label>
- <input
- type="checkbox"
- checked={catChecked}
- onChange={(e) => handleCheck('cat', e.currentTarget.checked)}
- />{' '}
- 🐱 cat
- </label>
- <label>
- <input
- type="checkbox"
- checked={caterpillarChecked}
- onChange={(e) =>
- handleCheck('caterpillar', e.currentTarget.checked)
- }
- />{' '}
- 🐛 caterpillar
- </label>
- </div>
- </form>
- )
+ return function useMediaQuery() {
+ return useSyncExternalStore(subscribe, getSnapshot)
+ }
}

-function MatchingPosts() {
- const [searchParams] = useSearchParams()
- const query = getQueryParam(searchParams)
- const matchingPosts = getMatchingPosts(query)
+const useNarrowMediaQuery = makeMediaQueryStore('(max-width: 600px)')

- return (
- <ul className="post-list">
- {matchingPosts.map((post) => (
- <Card key={post.id} post={post} />
- ))}
- </ul>
- )
+function NarrowScreenNotifier() {
+ const isNarrow = useNarrowMediaQuery()
+ return isNarrow ? 'You are on a narrow screen' : 'You are on a wide screen'
}

-function Card({ post }: { post: BlogPost }) {
- const [isFavorited, setIsFavorited] = useState(false)
+function App() {
return (
- <li>
- {isFavorited ? (
- <button
- aria-label="Remove favorite"
- onClick={() => setIsFavorited(false)}
- >
- ❤️
- </button>
- ) : (
- <button aria-label="Add favorite" onClick={() => setIsFavorited(true)}>
- 🤍
- </button>
- )}
- <div
- className="post-image"
- style={{ background: generateGradient(post.id) }}
- />
- <a
- href={post.id}
- onClick={(event) => {
- event.preventDefault()
- alert(`Great! Let's go to ${post.id}!`)
- }}
- >
- <h2>{post.title}</h2>
- <p>{post.description}</p>
- </a>
- </li>
+ <div>
+ <div>This is your narrow screen state:</div>
+ <Suspense fallback="">
+ <NarrowScreenNotifier />
+ </Suspense>
+ </div>
)
}

const rootEl = document.createElement('div')
document.body.append(rootEl)
-ReactDOM.createRoot(rootEl).render(<App />)
+// 🦉 here's how we pretend we're server-rendering
+rootEl.innerHTML = (await import('react-dom/server')).renderToString(<App />)
+
+// 🦉 here's how we simulate a delay in hydrating with client-side js
+await new Promise((resolve) => setTimeout(resolve, 1000))
+
+ReactDOM.hydrateRoot(rootEl, <App />, {
+ onRecoverableError(error) {
+ if (String(error).includes('Missing getServerSnapshot')) return
+
+ console.error(error)
+ },
+})
14 changes: 14 additions & 0 deletions src/__fixtures__/consecutive-empty-files
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/content b/content
new file mode 100644
index 0000000..6b584e8
--- /dev/null
+++ b/content
@@ -0,0 +1 @@
+content
\ No newline at end of file
diff --git a/empty b/empty
new file mode 100644
index 0000000..e69de29
diff --git a/empty2 b/empty2
new file mode 100644
index 0000000..e69de29
10 changes: 10 additions & 0 deletions src/__tests__/31-no-prefix.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { getFixture } from './test-utils';
import parseGitDiff from '../parse-git-diff';

describe('issue 31-no-prefix', () => {
const fixture = getFixture('31-no-prefix');

it('parse `31-no-prefix`', () => {
expect(parseGitDiff(fixture, { noPrefix: true })).toMatchSnapshot();
});
});
2 changes: 1 addition & 1 deletion src/__tests__/31.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getFixture } from './test-utils';
import parseGitDiff from '../parse-git-diff';

describe.only('issue 31', () => {
describe('issue 31', () => {
const fixture = getFixture('31');

it('parse `31`', () => {
Expand Down
Loading
Loading