Shielding vs electron-electron repulsion

**Example of shielding:**


![Shielding effect](https://i.stack.imgur.com/AeL3f.png) ([source](http://en.wikipedia.org/wiki/Effective_nuclear_charge))


The last electron in the 6s subshell of $\ce {Cs}$ is shielded from the nucleus by the inner electrons.


**Example of electron-electron repulsion:**


The electron affinity of $\ce F$ is surprisingly lower than that of $\ce{Cl}$. This is because, in $\ce F$, there are 5 electrons in the small-sized 2p subshell, so the electron density is very high. Therefore, the incoming electron is heavily repelled by the 5 electrons in the 2p subshell through electron-electron repulsion. So, the electron affinity of $\ce F$ is lower.


**My comments:**


Can the example of electron-electron repulsion of $\ce F$ be called shielding? I previously knew that electrons in the same shell don't contribute to shielding; however, I found a [comment](https://chemistry.stackexchange.com/questions/22406/is-shielding-of-electrons-really-best-described-as-shielding-or-is-it-really-cou/22408#comment32759_22408) on the contrary.


**My questions:**


1. Do electrons in the same shell contribute to shielding?
2. Can the example of electron-electron repulsion in the case of $\ce F$ be called shielding?


